Dev

.github/workflows/docker-cd-dev.yml

@@ -12,6 +12,9 @@ jobs:
 
     - name: Checkout Repository
       uses: actions/checkout@v2
+
+    - name: Setup Docker Buildx
+      uses: docker/setup-buildx-action@v2
 
     - name: Log in to Docker Hub
       uses: docker/login-action@v1
@@ -20,8 +23,9 @@ jobs:
         password: ${{ secrets.DOCKER_TOKEN }}
 
     - name: Build and push Server Docker image
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v4
       with:
         context: .
+        platforms: linux/amd64,linux/arm64,windows/amd64
         push: true
         tags: codexrems/test-ehr:REMSvExperimental

.github/workflows/docker-cd.yml

@@ -12,6 +12,9 @@ jobs:
 
     - name: Checkout Repository
       uses: actions/checkout@v2
+
+    - name: Setup Docker Buildx
+      uses: docker/setup-buildx-action@v2
 
     - name: Log in to Docker Hub
       uses: docker/login-action@v1
@@ -20,8 +23,9 @@ jobs:
         password: ${{ secrets.DOCKER_TOKEN }}
 
     - name: Build and push Server Docker image
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v4
       with:
         context: .
+        platforms: linux/amd64,linux/arm64,windows/amd64
         push: true
         tags: codexrems/test-ehr:REMSvCurrent

.github/workflows/keycloak-docker-cd-dev.yml

@@ -12,6 +12,9 @@ jobs:
 
     - name: Checkout Repository
       uses: actions/checkout@v2
+
+    - name: Setup Docker Buildx
+      uses: docker/setup-buildx-action@v2
 
     - name: Log in to Docker Hub
       uses: docker/login-action@v1
@@ -20,9 +23,10 @@ jobs:
         password: ${{ secrets.DOCKER_TOKEN }}
 
     - name: Build and push Keycloak Docker image
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v4
       with:
         context: .
+        platforms: linux/amd64,linux/arm64,windows/amd64
         file: Dockerfile.keycloak
         push: true
         tags: codexrems/keycloak:REMSvExperimental

.github/workflows/keycloak-docker-cd.yml

@@ -13,16 +13,20 @@ jobs:
     - name: Checkout Repository
       uses: actions/checkout@v2
 
+    - name: Setup Docker Buildx
+      uses: docker/setup-buildx-action@v2
+
     - name: Log in to Docker Hub
       uses: docker/login-action@v1
       with:
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_TOKEN }}
 
     - name: Build and push Keycloak Docker image
-      uses: docker/build-push-action@v2
+      uses: docker/build-push-action@v4
       with:
         context: .
+        platforms: linux/amd64,linux/arm64,windows/amd64
         file: Dockerfile.keycloak
         push: true
         tags: codexrems/keycloak:REMSvCurrent

README.md

@@ -1,16 +1,15 @@
 # EHR FHIR Server
 This subproject hosts a HAPI FHIR server that is based on the [hapi-fhir-jpaserver-example](https://github.com/jamesagnew/hapi-fhir/tree/master/hapi-fhir-jpaserver-example).
 
-## Init the test-ehr 
-1. delete `target` and `build` folders from test-ehr if they exist
-2. from Terminal (1) while in test-ehr folder: `gradle bootRun`
-3. from Terminal (2) while in test-ehr folder:   `gradle loadData`
-
 ## Running the server
-`gradle bootRun`
+1. Make sure `gradle` is installed on your machine. Gradle v8 or higher.
+2. Run `gradle bootRun`
+3. In a separate terminal tab, run `gradle loadData` to load resources
 
 This will start the server running on http://localhost:8080/test-ehr.
 
+**If you've loaded resources before, and want a clean slate, delete the `target` and `build` folders from test-ehr if they exist.**
+
 ## Adding resources to the database
 The FHIR server will persist FHIR resources between restarts. You can delete the folder `target` to clear all resources.
 
@@ -38,4 +37,7 @@ Finally, ensure that the [request generator](https://github.com/mcode/crd-reques
 |----|----|
 |`/test-ehr/`|Base server endpoint|
 |`/test-ehr/r4`|EHR FHIR Server endpoint (will not resolve in browser)|
+
+## Version
+Java v11 or higher is required to run this application.
 

src/main/java/org/hl7/davinci/ehrserver/Config.java

@@ -13,9 +13,11 @@ public abstract class Config {
 
   static {
     try {
-      if (System.getenv("DOCKER_PROFILE") != null && System.getenv("DOCKER_PROFILE").equals("true")) {
+      if (System.getenv("DOCKER_PROFILE") != null && System.getenv("DOCKER_PROFILE").equals("docker-windows")) {
+        load(Config.class.getResourceAsStream("/fhirServer.docker-windows.properties"));
+      } else if (System.getenv("DOCKER_PROFILE") != null && System.getenv("DOCKER_PROFILE").equals("docker-linux")) {
         load(Config.class.getResourceAsStream("/fhirServer.docker.properties"));
-      } else {
+      }else {
         load(Config.class.getResourceAsStream("/fhirServer.properties"));
       }
     } catch (IOException e) {

src/main/resources/fhirServer.docker-windows.properties

@@ -0,0 +1,11 @@
+client_id = app-token
+client_secret= #replaceMe#
+realm=ClientFhirServer
+use_oauth = false
+oauth_token = http://docker.for.win.localhost:8180/auth/realms/ClientFhirServer/protocol/openid-connect/token
+oauth_authorize =  http://localhost:8180/auth/realms/ClientFhirServer/protocol/openid-connect/auth
+proxy_authorize = http://localhost:8080/test-ehr/auth
+proxy_token = http://localhost:8080/test-ehr/token
+redirect_post_launch = http://localhost:8080/test-ehr/_services/smart/Launch
+redirect_post_token = http://localhost:8080/test-ehr/token
+auth_redirect_host = localhost