Skip to content

Commit 7c54aa6

Browse files
authored
Merge pull request #200 from maevsi/feat/grafana/readd
feat(postgres)!: drop database and role creation entrypoint
2 parents 4c600a4 + 96c9d88 commit 7c54aa6

File tree

4 files changed

+3
-47
lines changed

4 files changed

+3
-47
lines changed

src/development/stack.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,6 @@ services:
292292
# You can access the database via `adminer`.
293293
command: -c vibetype.jwt_expiry_duration='1 month' -c wal_level=logical
294294
environment:
295-
POSTGRES_ADDITIONAL_DBS: grafana
296295
POSTGRES_DB_FILE: /run/secrets/postgres_db
297296
POSTGRES_PASSWORD_FILE: /run/secrets/postgres_password
298297
POSTGRES_USER_FILE: /run/secrets/postgres_user
@@ -302,8 +301,6 @@ services:
302301
secrets:
303302
- postgres_db
304303
- postgres_password
305-
- postgres_role_service_grafana_password
306-
- postgres_role_service_grafana_username
307304
- postgres_user
308305
# sysctls:
309306
# # Prevent Docker Swarm from killing connections (https://github.com/moby/moby/issues/31208)
@@ -312,7 +309,6 @@ services:
312309
# - net.ipv4.tcp_keepalive_probes=10
313310
volumes:
314311
- postgres_data:/var/lib/postgresql/data/
315-
- ../production/configurations/postgres/docker-entrypoint-initdb.d/additional-databases.sh:/docker-entrypoint-initdb.d/additional-databases.sh:ro
316312
prometheus:
317313
# You can access the metrics monitoring at [prometheus.localhost](https://prometheus.localhost/).
318314
deploy:
@@ -388,6 +384,8 @@ services:
388384
# You cannot access the database migrations directly.
389385
image: maevsi/sqitch:dev
390386
secrets:
387+
- postgres_role_service_grafana_password
388+
- postgres_role_service_grafana_username
391389
- postgres_role_service_postgraphile_password
392390
- postgres_role_service_postgraphile_username
393391
- postgres_role_service_vibetype_password

src/production/configurations/postgres/docker-entrypoint-initdb.d/PERMISSIONS.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

src/production/configurations/postgres/docker-entrypoint-initdb.d/additional-databases.sh

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/production/production.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ services:
8282
image: ghcr.io/maevsi/reccoom:0.1.0
8383
volumes: (( prune ))
8484
sqitch:
85-
image: ghcr.io/maevsi/sqitch:8.0.0-beta.8
85+
image: ghcr.io/maevsi/sqitch:8.0.0-beta.9
8686
volumes: (( prune ))
8787
traefik:
8888
command:

0 commit comments

Comments
 (0)