Skip to content

Commit

Permalink
Merge pull request #16 from knopki/fix-uglify-compose-file
Browse files Browse the repository at this point in the history
build(compose): dynamic container names
  • Loading branch information
blokhin authored Jul 2, 2023
2 parents cf1de4c + d4dc69d commit 3d334a4
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 8 deletions.
6 changes: 0 additions & 6 deletions .docker/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
version: "3.9"
services:
db:
container_name: metis-db
image: docker.io/library/postgres:14
environment:
POSTGRES_USER: &dbuser metis
Expand All @@ -18,7 +17,6 @@ services:
retries: 10

rabbitmq:
container_name: metis-rmq
image: docker.io/library/rabbitmq:3.8.14-management
environment:
RABBITMQ_DEFAULT_USER: &rabbituser guest
Expand All @@ -32,7 +30,6 @@ services:
retries: 5

metis-backend:
container_name: metis-backend
environment:
PGDATABASE: *dbname
PGHOST: db
Expand Down Expand Up @@ -67,7 +64,6 @@ services:
retries: 10

metis-bff:
container_name: metis-bff
depends_on:
db:
condition: service_healthy
Expand All @@ -87,7 +83,6 @@ services:
- "3000:3000"

metis-gui:
container_name: metis-gui
environment:
PORT: "8080"
FORCE_HTTPS: "0"
Expand All @@ -102,7 +97,6 @@ services:

yanode:
image: docker.io/linuxserver/openssh-server:latest
container_name: yanode
environment:
- PUID=1000
- PGID=1000
Expand Down
2 changes: 1 addition & 1 deletion .docker/s6-rc.d/yascheduler-add-node/up
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ if { s6-test -v YASCHEDULER_ADD_NODE_HOST }
importas HOST YASCHEDULER_ADD_NODE_HOST
importas -D "root" USERNAME YASCHEDULER_ADD_NODE_USER
foreground { echo Adding node $HOST }
wait-for-it ${HOST}:22 --timeout=60 --strict -- bash -c "yasetnode ${USERNAME}@$( getent hosts $HOST | awk '{ print $1 }' )"
wait-for-it ${HOST}:22 --timeout=60 --strict -- bash -c "yasetnode ${USERNAME}@$( getent ahosts $HOST | awk '{ print $1 }' | head -n 1 )"
1 change: 0 additions & 1 deletion compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ services:
- ./.docker/db/pgcrypto.sql:/docker-entrypoint-initdb.d/10-pgcrypto.sql

adminer:
container_name: metis-adminer
depends_on: ["db"]
image: docker.io/library/adminer:4
ports:
Expand Down

0 comments on commit 3d334a4

Please sign in to comment.