Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(ci): Docker Compose updates #41

Merged
merged 11 commits into from
Aug 13, 2024
Merged

chore(ci): Docker Compose updates #41

Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
df18431
Comment out envar requirement
DerekRoberts Aug 13, 2024
92db080
Swap some booleans for strings
DerekRoberts Aug 13, 2024
86b888a
Remove bind mounts
DerekRoberts Aug 13, 2024
5a5d308
Use default networking
DerekRoberts Aug 13, 2024
d9d55de
Simplify pgdata volume
DerekRoberts Aug 13, 2024
42a3ab2
Move pgadmin into separate profile
DerekRoberts Aug 13, 2024
e1f6ff2
Uncomment analysis results
DerekRoberts Aug 13, 2024
e72cb37
Uncomment more workflows
DerekRoberts Aug 13, 2024
1016698
Restore Trivy vuln scanner
DerekRoberts Aug 13, 2024
681ae5e
Bump openshift helpers
DerekRoberts Aug 13, 2024
539a1d5
More commenting
DerekRoberts Aug 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 30 additions & 60 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
# For example:
# docker login -u garywong-bc -p `oc whoami -t` docker-registry.pathfinder.gov.bc.ca
services:

#############################################################################################
### Minio-Pub ###
#############################################################################################
Expand All @@ -16,17 +17,16 @@ services:
context: ./gwells/openshift/docker/minio/
hostname: minio
ports:
- "9000:9000"
- "9000:9000"
volumes:
- /data
- /data
environment:
MINIO_ACCESS_KEY: minio
MINIO_SECRET_KEY: minio1234
MINIO_DATA_DIR: /data
entrypoint: /minio-entrypoint.sh
command: server /data
networks:
- gwells-network

#############################################################################################
### Minio-Priv ###
#############################################################################################
Expand All @@ -35,17 +35,16 @@ services:
context: ./gwells/openshift/docker/minio/
hostname: minio
ports:
- "9001:9001"
- "9001:9001"
volumes:
- /data
- /data
environment:
MINIO_ACCESS_KEY: minio
MINIO_SECRET_KEY: minio1234
MINIO_DATA_DIR: /data
entrypoint: /minio-entrypoint.sh
command: server --address :9001 /data
networks:
- gwells-network

#############################################################################################
### CrunchyDB ###
#############################################################################################
Expand All @@ -72,21 +71,17 @@ services:
TILESERVER_USER: ftw_reader
TILESERVER_PASSWORD: test1
ports:
- "5432:5432"
- "5432:5432"
volumes:
- pgdata-volume:/pgdata:z
- type: bind
source: ./database/scripts/local_dev/setup.sql
target: /pgconf/setup.sql
consistency: cached
- /pgdata
- ./database/scripts/local_dev/setup.sql:/pgconf/setup.sql
healthcheck:
test: ["CMD-SHELL", "/usr/pgsql-12/bin/pg_isready", "-d", "gwells"]
interval: 20s
timeout: 30s
retries: 5
start_period: 120s
networks:
- gwells-network

#############################################################################################
### Tileserv ###
#############################################################################################
Expand All @@ -96,16 +91,15 @@ services:
- db
platform: linux/x86_64
image: pramsey/pg_tileserv:20231005
env_file:
- path: ./.env.test
required: false
# env_file:
# - path: ./.env.test
# required: false
environment:
DATABASE_URL: "postgres://ftw_reader:${DATABASE_PASSWORD:-test1}@${GWELLS_SERVICE_HOST:-db}:${GWELLS_SERVICE_PORT:-5432}/gwells"
ports:
- "7800:7800"
entrypoint: sh -c "sleep 10; /app/pg_tileserv"
networks:
- gwells-network

#############################################################################################
### Frontend ###
#############################################################################################
Expand All @@ -116,7 +110,7 @@ services:
dockerfile: Dockerfile
hostname: frontend
environment:
DEBUG: "True"
DEBUG: "true"
VUE_APP_AXIOS_BASE_URL: /api/
VUE_APP_VECTOR_TILE_BASE_URL: "/tiles/"
VECTOR_TILE_SERVER: "http://tileserv:7800/"
Expand All @@ -126,14 +120,11 @@ services:
ports:
- "8080:8080"
volumes:
- type: bind
source: ./frontend
target: /frontend
- ./frontend:/frontend
- /frontend/node_modules/
depends_on:
- backend
networks:
- gwells-network

#############################################################################################
### Backend ###
#############################################################################################
Expand All @@ -157,10 +148,10 @@ services:
DATABASE_PASSWORD: "${DATABASE_PASSWORD:-test1}"
DATABASE_SERVICE_NAME: gwells
DJANGO_ADMIN_URL: admin
DJANGO_DEBUG: "True"
DJANGO_DEBUG: "true"
DJANGO_SECRET_KEY: secret
ENABLE_ADDITIONAL_DOCUMENTS: "True"
ENABLE_AQUIFERS_SEARCH: "True"
ENABLE_ADDITIONAL_DOCUMENTS: "true"
ENABLE_AQUIFERS_SEARCH: "true"
GWELLS_SERVICE_HOST: "${GWELLS_SERVICE_HOST:-db}"
GWELLS_SERVICE_PORT: "${GWELLS_SERVICE_PORT:-5432}"
MINIO_ACCESS_KEY: minio
Expand Down Expand Up @@ -193,8 +184,8 @@ services:
S3_USE_SECURE: 0
EMAIL_NOTIFICATION_RECIPIENT: sustainment.team@gov.bc.ca
GEOCODER_ADDRESS_API_BASE: https://geocoder.api.gov.bc.ca/addresses.json?
LOCAL: True
LOAD_FIXTURES: True
LOCAL: "true"
LOAD_FIXTURES: "true"
command: /bin/bash -c "
python3 -m pip install --upgrade pip &&
python3 -m pip install ptvsd &&
Expand All @@ -205,48 +196,27 @@ services:
python3 manage.py collectstatic --noinput &&
python3 manage.py export --cleanup=1 --upload=1 &&
python3 manage.py runserver 0.0.0.0:8000"
volumes:
- type: bind
source: ./backend
target: /backend
consistency: cached
# - type: bind
# source: ./backend-command-script.sh
# target: /backend-command-script.sh
# consistency: cached
volumes:
- ./backend:/backend
# - ./backend-command-script.sh:/backend-command-script.sh
ports:
- "8000:8000"
- "3000:3000"
depends_on:
db:
condition: service_healthy
networks:
- gwells-network

#############################################################################################
### Volumes ###
### PGAdmin ###
#############################################################################################
pgadmin:
container_name: gwells-pgadmin
profiles: ["pgadmin"]
image: dpage/pgadmin4
ports:
- 5050:80
environment:
PGADMIN_DEFAULT_PASSWORD: admin
PGADMIN_DEFAULT_EMAIL: admin@gwells.com
networks:
- gwells-network


#############################################################################################
### Volumes ###
#############################################################################################
volumes:
pgdata-volume:

#############################################################################################
### Network ###
#############################################################################################
networks:
gwells-network:
driver: "bridge"
depends_on:
- db
Loading