Skip to content

Commit

Permalink
debug
Browse files Browse the repository at this point in the history
  • Loading branch information
Emterry committed Dec 3, 2024
1 parent a0de990 commit e43eedd
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,13 @@ IMAGE_TAG ?= local
DOCKER_BUILDKIT?=1
# REGISTRY?=593291632749.dkr.ecr.eu-west-1.amazonaws.com
MAKEFLAGS += -j2
IMAGE_NAME ?= ghcr.io/ministryofjustice/analytical-platform-control-panel
IMAGE_NAME ?= ghcr.io/ministryofjustice/analytics-platform-control-panel


include Makefile.local.mk
export


.PHONY: clean build help test test-python dev-up

clean:
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3"

services:
frontend:
image: ${REGISTRY}/${REPOSITORY}:${IMAGE_TAG:-latest}
image: ${IMAGE_NAME}:${IMAGE_TAG-latest}
stdin_open: true
tty: true
command: ["python", "manage.py", "runserver", "0.0.0.0:8000"]
Expand All @@ -11,11 +11,11 @@ services:
./tests:/home/controlpanel/tests
]
migration:
image: ${REGISTRY}/${REPOSITORY}:${IMAGE_TAG:-latest}
image: ${IMAGE_NAME}:${IMAGE_TAG}
volumes: [./controlpanel:/home/controlpanel/controlpanel]
command: "python manage.py migrate"
worker:
image: ${REGISTRY}/${REPOSITORY}:${IMAGE_TAG:-latest}
image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}
stdin_open: true
tty: true
volumes: [./controlpanel:/home/controlpanel/controlpanel]
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ services:
command: sh -c "exec redis-server --requirepass \"$${REDIS_PASSWORD}\""

migration:
image: ${IMAGE_NAME}:${IMAGE_TAG:-latest}
image: ${IMAGE_NAME}:${IMAGE_TAG}
depends_on:
db:
condition: service_healthy
Expand All @@ -35,7 +35,7 @@ services:
command: sh -c "./manage.py migrate"

worker:
image: ${IMAGE_NAME}_eks:${IMAGE_TAG:-latest}
image: ${IMAGE_NAME}_eks:${IMAGE_TAG}
depends_on:
redis:
condition: service_started
Expand All @@ -62,7 +62,7 @@ services:

frontend:
# Apologies to future devops. Naming is hard.
image: ${IMAGE_NAME}_eks:${IMAGE_TAG:-latest}
image: ${IMAGE_NAME}_eks:${IMAGE_TAG}
build:
context: .
# network: ${NETWORK:-default}
Expand Down

0 comments on commit e43eedd

Please sign in to comment.