diff --git a/config.json b/config.json index 8f62a3c4..3b9e8ccc 100644 --- a/config.json +++ b/config.json @@ -7,7 +7,8 @@ ], "images": { "linux/arm64": { - "registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/arm64:v2.1": "streamline-emr:latest" + "registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/arm64:v2.1": "streamline-emr:latest", + "registry.gitlab.com/signalytic/client-external/streamline/streamline-emr/statistics/arm64:2.2": "statistics:latest" } } } diff --git a/hosted-app-utils b/hosted-app-utils index 3785af30..6af4c4ae 160000 --- a/hosted-app-utils +++ b/hosted-app-utils @@ -1 +1 @@ -Subproject commit 3785af3094b2b92f6daceb670e7bbb7a5d83d369 +Subproject commit 6af4c4ae8520e499c53a6bd80567454061e89103 diff --git a/src/docker-compose.yml b/src/docker-compose.yml index 8bcac24d..8b68ccbe 100755 --- a/src/docker-compose.yml +++ b/src/docker-compose.yml @@ -4,9 +4,10 @@ services: container_name: ${APP_CONTAINER:-streamline-emr} restart: unless-stopped volumes: - - "${DATA_DIR:-./data}:/var/lib/mysql" + - "/var/signalytic/clientapps/streamline/streamline_emr/data:/var/lib/mysql" ports: - "${APP_PORT:-3000}:80" + command: ["sh", "-c", "composer install && php artisan migrate"] healthcheck: test: ["CMD", "curl", "-f", "http://localhost:80"] timeout: 30s @@ -14,4 +15,17 @@ services: start_interval: 10s interval: 30s retries: 5 - + networks: + - streamline + statistics: + image: ${STATISTICS_IMAGE:-statistics:latest} + container_name: ${STATISTICS_CONTAINER:-statistics} + restart: unless-stopped + # volumes: + # - ./resources/statistics:/ + depends_on: + - streamline-emr + networks: + - streamline +networks: + streamline: