Skip to content

Commit

Permalink
FIX: findby UPG: compose
Browse files Browse the repository at this point in the history
  • Loading branch information
tero-punos committed Nov 29, 2024
1 parent 86a2834 commit 4ee194e
Show file tree
Hide file tree
Showing 2 changed files with 118 additions and 169 deletions.
44 changes: 41 additions & 3 deletions dev.docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,14 @@ services:
image: jkr/postgis
build:
context: ./docker/postgis
deploy:
resources:
limits:
cpus: '4'
memory: 8G
reservations:
cpus: '2'
memory: 4G
volumes:
- postgis-data:/var/lib/postgresql/data
- ./docker/postgis/init_db:/docker-entrypoint-initdb.d
Expand All @@ -30,6 +38,14 @@ services:
container_name: jkr_test_database
build:
context: ./docker/postgis/test
deploy:
resources:
limits:
cpus: '1'
memory: 2G
reservations:
cpus: '0.5'
memory: 1G
volumes:
- postgis-data-test:/var/lib/postgresql/data
- ./docker/postgis/test/init_test_db:/docker-entrypoint-initdb.d
Expand All @@ -50,6 +66,11 @@ services:
depends_on:
- db
profiles: [ "migration" ]
deploy:
resources:
limits:
cpus: '0.5'
memory: 512M
environment:
- FLYWAY_USER=${JKR_USER}
- FLYWAY_PASSWORD=${JKR_PASSWORD}
Expand All @@ -64,6 +85,11 @@ services:
depends_on:
- db_test
profiles: [ "migration" ]
deploy:
resources:
limits:
cpus: '0.5'
memory: 512M
environment:
- FLYWAY_USER=${JKR_USER}
- FLYWAY_PASSWORD=${JKR_TEST_PASSWORD}
Expand All @@ -78,19 +104,31 @@ services:
depends_on:
- db
profiles: [ "dev" ]
deploy:
resources:
limits:
cpus: '0.5'
memory: 512M
volumes:
- ./docs/db:/work/db
- ./db/.tbls.yml:/work/.tbls.yml
command: doc --rm-dist -c /work/.tbls.yml postgres://${JKR_USER}:${JKR_PASSWORD}@db:5432/${JKR_DB}?sslmode=disable /work/db

# jkr-core-runner kontti skriptien ajoon
jkr-core-runner:
build: .
container_name: jkr-core-runner
depends_on:
- db
deploy:
resources:
limits:
cpus: '4'
memory: 8G
reservations:
cpus: '2'
memory: 4G
volumes:
- .:/app # Mountataan paikallinen projektihakemisto
- .:/app
environment:
- JKR_DB_HOST=db
- JKR_DB=${JKR_DB}
Expand All @@ -101,4 +139,4 @@ services:
- HOOK_URL=${HOOK_URL}
networks:
- default
command: bash -c "cd /app && poetry install && cd /app/scripts && exec /bin/bash"
command: bash -c "cd /app && poetry install && cd /app/scripts && exec /bin/bash"
Loading

0 comments on commit 4ee194e

Please sign in to comment.