diff --git a/Makefile b/Makefile index 15033436..4bfcc3e8 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ REPOSITORY?=controlpanel VIRTUAL_ENV ?= venv BIN=${VIRTUAL_ENV}/bin -IMAGE_TAG ?= local +IMAGE_TAG ?= latest DOCKER_BUILDKIT?=1 # REGISTRY?=593291632749.dkr.ecr.eu-west-1.amazonaws.com MAKEFLAGS += -j2 diff --git a/docker-compose.dev.yaml b/docker-compose.dev.yaml index a023fb52..43e6a94b 100644 --- a/docker-compose.dev.yaml +++ b/docker-compose.dev.yaml @@ -11,7 +11,7 @@ services: ./tests:/home/controlpanel/tests ] migration: - image: ${IMAGE_NAME}:${IMAGE_TAG} + image: ${IMAGE_NAME}:${IMAGE_TAG-latest} volumes: [./controlpanel:/home/controlpanel/controlpanel] command: "python manage.py migrate" worker: diff --git a/docker-compose.yaml b/docker-compose.yaml index 2197c70a..4bdccc6b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -18,7 +18,7 @@ services: command: sh -c "exec redis-server --requirepass \"$${REDIS_PASSWORD}\"" migration: - image: ${IMAGE_NAME}:${IMAGE_TAG} + image: ${IMAGE_NAME}_eks:${IMAGE_TAG} depends_on: db: condition: service_healthy