Fix the CI errors

marcdeop · Sep 14, 2022 · a934e57 · a934e57
1 parent 7d117be
commit a934e57
Show file tree

Hide file tree

Showing 2 changed files with 349 additions and 343 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -40,6 +40,9 @@ ARG MVN_ARGS='install'
 COPY checkstyle.xml checkstyle-suppressions.xml CONTRIBUTING.md findbugs-include.xml LICENSE license-header.txt \
  NOTICE.md README.md ruleset.xml SECURITY.md ./
 
+# build the parent project first
+RUN mvn --non-recursive $MVN_ARGS_SETTINGS $MVN_ARGS
+
 COPY liquibase ./liquibase/
 RUN mvn -pl liquibase $MVN_ARGS_SETTINGS $MVN_ARGS
 
@@ -130,7 +133,8 @@ ENV OMRS_CONFIG_CONNECTION_DATABASE="openmrs"
 ENV OMRS_WEBAPP_NAME="openmrs"
 
 RUN sed -i '/Connector port="8080"/a URIEncoding="UTF-8" relaxedPathChars="[]|" relaxedQueryChars="[]|{}^&#x5c;&#x60;&quot;&lt;&gt;"' /usr/local/tomcat/conf/server.xml
-
+
+COPY --from=dev /app/LICENSE LICENSE
 # Copy the app
 COPY --from=dev /app/webapp/target/openmrs.war /openmrs/distribution/openmrs_core/openmrs.war