From 2ff2329118b1d88767235d652498a3cb87b32e39 Mon Sep 17 00:00:00 2001 From: Dana Lambert Date: Wed, 10 Nov 2021 17:21:57 +1300 Subject: [PATCH] Add docker-compose production with dev command --- dev | 8 ++++++ docker-compose.production.yaml | 50 ++++++++++++++++++++++++++++++++++ docker-compose.yaml | 7 ++--- 3 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 docker-compose.production.yaml diff --git a/dev b/dev index dd892a7..5222be4 100755 --- a/dev +++ b/dev @@ -95,6 +95,14 @@ cmd_start() { docker-compose up } +cmd_build_production() { + docker-compose -f docker-compose.production.yaml build +} + +cmd_start_production() { + docker-compose -f docker-compose.production.yaml up --remove-orphans +} + # Run the command cmd="$1" "cmd_$cmd" "$@" diff --git a/docker-compose.production.yaml b/docker-compose.production.yaml new file mode 100644 index 0000000..a8e4a2d --- /dev/null +++ b/docker-compose.production.yaml @@ -0,0 +1,50 @@ +version: "3.8" + +volumes: + local-postgres-data: + name: local-postgres-data + +services: + django-backend: + restart: unless-stopped + build: + context: backend + dockerfile: Dockerfile + container_name: righttree-backend + depends_on: + - postgres + volumes: + - ./backend:/app + environment: + - LINZ_API_KEY=${LINZ_API_KEY} + - FRONTEND_BASE_URL=${FRONTEND_BASE_URL} + ports: + - "8000:8000" + command: bash -c "./manage.py runserver 0.0.0.0:8000" + + react-frontend: + build: + context: frontend + dockerfile: Dockerfile + restart: unless-stopped + container_name: righttree-frontend + ports: + - "3000:3000" + working_dir: /app + command: sh -c "serve -s build" + + + postgres: + image: postgis/postgis:13-3.0 + restart: unless-stopped + container_name: postgres + volumes: + - local-postgres-data:/var/lib/postgresql/data + - ./create_database.sql:/docker-entrypoint-initdb.d/create_database.sql + ports: + - "5432:5432" + environment: + - POSTGRES_DB=${POSTGRES_DB} + - POSTGRES_USER=${POSTGRES_USER} + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} + diff --git a/docker-compose.yaml b/docker-compose.yaml index 4333724..37a9816 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -42,7 +42,6 @@ services: ports: - "5432:5432" environment: - - POSTGRES_DB=postgres - - POSTGRES_USER=postgres - - POSTGRES_PASSWORD=postgres - \ No newline at end of file + - POSTGRES_DB=${POSTGRES_DB} + - POSTGRES_USER=${POSTGRES_USER} + - POSTGRES_PASSWORD=${POSTGRES_PASSWORD} \ No newline at end of file