Adjusted docker build

.dockerignore

@@ -3,3 +3,4 @@
 **/node_modules/
 **/node
 *.iml
+.idea/

.gitignore

@@ -1,3 +1,4 @@
 **/target/
 **/.DS_Store
 **/node_modules/
+.idea/

Dockerfile

@@ -0,0 +1,28 @@
+# syntax=docker/dockerfile:1
+
+### Dev Stage
+FROM openmrs/openmrs-core:dev as dev
+WORKDIR /app
+
+ENV MVN_ARGS_SETTINGS="-s /usr/share/maven/ref/settings-docker.xml"
+ENV MVN_ARGS="install"
+
+# Copy build files
+COPY pom.xml ./
+COPY distro ./distro/
+
+# Build the distro
+RUN mvn $MVN_ARGS_SETTINGS $MVN_ARGS
+
+### Run Stage
+# Replace 'nightly' with the exact version of openmrs-core built for production (if available)
+FROM openmrs/openmrs-core:nightly
+
+# Do not copy the war if using the correct openmrs-core image version
+COPY --from=dev /app/distro/target/sdk-distro/web/openmrs.war /openmrs/distribution/openmrs_core
+
+COPY --from=dev /app/distro/target/sdk-distro/web/openmrs-distro.properties /openmrs/distribution
+
+COPY --from=dev /app/distro/target/sdk-distro/web/modules /openmrs/distribution/openmrs_modules
+COPY --from=dev /app/distro/target/sdk-distro/web/owa /openmrs/distribution/openmrs_owas
+COPY --from=dev /app/distro/target/referenceapplication-distro/openmrs_config /openmrs/distribution/openmrs_config

README.md

@@ -3,23 +3,14 @@
 #### Package the distribution and prepare the run
 
 ```
-mvn clean package
+docker-compose build
 ```
 
 #### Run the app
 ```
-cd run/docker
 docker-compose up
 ```
 
 New OpenMRS UI is accessible at http://localhost/openmrs/spa
 
 OpenMRS Legacy UI is accessible at http://localhost/openmrs
-
----
-
-## Notes
-
-`package/` Package the OpenMRS distribution with the specified dependencies (omod, frontend modules, configurations...). See [package/README.md](distro/README.md) for more info.
-
-`run/` Run the OpenMRS distribution. Currently, this only supports Docker. See [run/README.md](run/README.md) for more info.

distro/distro.properties

@@ -1,5 +1,5 @@
 name=Ref 3.x distro
-version=1.0
+version=3.0.0
 war.openmrs=${openmrs.version}
 omod.initializer=${initializer.version}
 omod.fhir2=${fhir2.version}

distro/pom.xml

@@ -41,7 +41,7 @@
     <appointments.version>1.4.0</appointments.version>
     <cohort.version>3.0.0-SNAPSHOT</cohort.version>
     <reporting.version>1.25.0-SNAPSHOT</reporting.version>
-    <reportingrest.version>1.13.0</reportingrest.version>
+    <reportingrest.version>1.14.0-SNAPSHOT</reportingrest.version>
     <!-- the next three are required for reporting -->
     <calculation.version>1.3.0</calculation.version>
     <htmlwidgets.version>1.10.0</htmlwidgets.version>

docker/docker-compose.yml → docker-compose.yml

@@ -1,8 +1,8 @@
 version: "3.7"
 
 services:
-  # Gateway
   gateway:
+    image: openmrs/openmrs-reference-application-3-gateway:${TAG:-nightly}
     build:
       context: ./gateway
     depends_on:
@@ -11,26 +11,22 @@ services:
     ports:
       - 80:80
 
-  # Frontend
   frontend:
+    image: openmrs/openmrs-reference-application-3-frontend:${TAG:-nightly}
     build:
       context: ./frontend
-      target: ${target:-base}
     environment:
       SPA_PATH: /openmrs/spa
       API_URL: /openmrs
       SPA_CONFIG_URLS:
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost/"]
       timeout: 5s
-    volumes:
-      - ./distro/spa:/usr/share/nginx/html/
 
-  # OpenMRS:
   backend:
+    image: openmrs/openmrs-reference-application-3-backend:${TAG:-nightly}
     build:
-      context: backend
-      target: ${target:-base}
+      context: .
     depends_on:
       - db
     environment:
@@ -46,9 +42,6 @@ services:
       timeout: 5s
     volumes:
       - openmrs-data:/openmrs/data
-      - ./distro/openmrs_core/:/openmrs/distribution/openmrs_core/
-      - ./distro/openmrs_modules:/openmrs/distribution/openmrs_modules/
-      - ./distro/openmrs_config:/openmrs/distribution/openmrs_config/
 
   # MariaDB
   db: