Merge branch 'main' into TB-124-add-pgpool-connection-manager

Author: bradsawadye

fhir-datastore-hapi-fhir/Dockerfile

@@ -1,8 +1,6 @@
-FROM hapiproject/hapi:v5.7.0
+FROM hapiproject/hapi:v6.0.1
 
 # Copy the static shell into base image
-COPY --from=busybox /bin/sh /bin/sh
+COPY --from=busybox:1.36.0-uclibc /bin/sh /bin/sh
 # Copy all necessary executables into distroless image
-COPY --from=busybox /bin/wget /bin/wget
-
-
+COPY --from=busybox:1.36.0-uclibc /bin/wget /bin/wget

fhir-datastore-hapi-fhir/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.9'
 
 services:
   hapi-fhir:
-    image: jembi/hapi:v5.7.0-wget
+    image: jembi/hapi:v6.0.1-wget
     networks:
       mpi:
       public: