Production Overrides (#14)

* Remove hapi ingress from default dev config

* Remove fhir server from ingress network, by default

* Add prod override file

* Update default postgres version

dev/default.env

@@ -22,9 +22,6 @@ COMPOSE_PROJECT_NAME=
 # MESSAGING_IMAGE_TAG=override-tag-name
 # MESSAGINGSERVICE_IMAGE_TAG=override-tag-name
 
-# Uncomment for deploys with traefik-managed ingress
-# COMPOSE_FILE=docker-compose.yaml:docker-compose.ingress.yaml
-
 # docker-compose development overrides; uncomment to enable
 # COMPOSE_FILE=docker-compose.yaml:docker-compose.ingress.yaml:docker-compose.dev.femr.yaml:docker-compose.dev.fhirwall.yaml:docker-compose.dev.messagingservice.yaml
 

dev/docker-compose.prod.yaml

@@ -0,0 +1,32 @@
+---
+version: "3.7"
+services:
+  db:
+    restart: unless-stopped
+
+  femr:
+    restart: unless-stopped
+
+  fhir:
+    restart: unless-stopped
+
+  fhirwall:
+    restart: unless-stopped
+
+  keycloak:
+    restart: unless-stopped
+
+  logs:
+    restart: unless-stopped
+
+  redis:
+    restart: unless-stopped
+
+  enrollment:
+    restart: unless-stopped
+
+  messaging:
+    restart: unless-stopped
+
+  messagingservice:
+    restart: unless-stopped

dev/docker-compose.yaml

@@ -2,7 +2,7 @@
 version: "3.7"
 services:
   db:
-    image: postgres:${POSTGRES_IMAGE_TAG:-12}
+    image: postgres:${POSTGRES_IMAGE_TAG:-15}
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
@@ -76,24 +76,15 @@ services:
       # make URLs relative to fEMR for pagination
       # TODO remove when fEMR can rewrite URLs
       hapi.fhir.server_address: 'https://femr.${BASE_DOMAIN:-localtest.me}/fhir/'
-    # expose HAPI to internet - remove entire `labels` section if unwanted
-    labels:
-      - "traefik.enable=true"
-      - "traefik.http.routers.fhir-${COMPOSE_PROJECT_NAME}.rule=Host(`fhir.${BASE_DOMAIN:-localtest.me}`)"
-      - "traefik.http.routers.fhir-${COMPOSE_PROJECT_NAME}.entrypoints=websecure"
-      - "traefik.http.routers.fhir-${COMPOSE_PROJECT_NAME}.tls=true"
-      - "traefik.http.routers.fhir-${COMPOSE_PROJECT_NAME}.tls.certresolver=letsencrypt"
     volumes:
       - "./config/hapi/application.yaml:/opt/application.yaml:ro"
     depends_on:
       - db
     networks:
-      ingress:
       internal:
         aliases:
           - fhir-internal
 
-
   fhirwall:
     image: ghcr.io/uwcirg/jwt-proxy:${PROXY_IMAGE_TAG:-latest}
     env_file: