Merge pull request #296 from Ecotrust/gh-package-docker-compose

Gh package docker compose

Author: paigewilliams

docker/docker-compose.prod.local.yaml

@@ -8,6 +8,7 @@ services:
     extends:
       file: common.yaml
       service: web
+    image: ${WEB_IMAGE}:latest
     command: ["prod-local"]
     env_file:
       - path: .env.dev

docker/docker-compose.prod.yaml

@@ -8,7 +8,7 @@ services:
     extends:
       file: common.yaml
       service: web
-    image: ${ITKDB_ECR_PATH}:latest
+    image: ${WEB_IMAGE}:latest
     command: ["prod"]
     env_file:
       - path: .env.prod
@@ -24,7 +24,7 @@ services:
       - static_volume:/usr/src/app/static
       - media_volume:/usr/src/app/media
   proxy:
-    image: ${ITKDB_PROXY_ECR_PATH}:latest
+    image: ${PROXY_IMAGE}:latest
     restart: unless-stopped
     depends_on:
       - web
@@ -46,7 +46,7 @@ services:
     extends:
       file: common.yaml
       service: celery
-    image: ${ITKDB_ECR_PATH}:latest
+    image: ${WEB_IMAGE}:latest
     env_file:
       - path: .env.prod
         required: true
@@ -56,7 +56,7 @@ services:
     extends:
       file: common.yaml
       service: celery-beat
-    image: ${ITKDB_ECR_PATH}:latest
+    image: ${WEB_IMAGE}:latest
     env_file:
       - path: .env.prod
         required: true

infra/user_data.tftpl

@@ -73,8 +73,8 @@ SQL_USER=${sql_db_user}
 SQL_PASSWORD=${sql_db_password}
 SQL_HOST=${sql_host}
 SQL_PORT=${sql_port}
-ITKDB_ECR_PATH=${web_ecr_image_uri}
-ITKDB_PROXY_ECR_PATH=${proxy_ecr_image_uri}
+WEB_IMAGE=${web_ecr_image_uri}
+PROXY_IMAGE=${proxy_ecr_image_uri}
 CELERY_BROKER_URL=${celery_broker_url}
 GIS_USER_PASSWORD=${gis_user_password}
 DOMAIN_NAME=${domain_name}