From 133a80a70e12d3ef5db3256a1b38fffb823e4844 Mon Sep 17 00:00:00 2001 From: Raine Date: Sun, 22 Oct 2023 17:02:01 +0200 Subject: [PATCH] fix: dc error --- .../keymaker/docker-compose.d/docker-compose.shlink.yml | 2 +- tools/repo/check-docker-compose.sh | 8 ++++++++ tools/server-docker-compose.sh | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 tools/repo/check-docker-compose.sh diff --git a/servers/keymaker/docker-compose.d/docker-compose.shlink.yml b/servers/keymaker/docker-compose.d/docker-compose.shlink.yml index d3bfe04..67cd591 100644 --- a/servers/keymaker/docker-compose.d/docker-compose.shlink.yml +++ b/servers/keymaker/docker-compose.d/docker-compose.shlink.yml @@ -12,7 +12,7 @@ services: DB_PASSWORD: shlink DB_HOST: shlink-db env_file: - - ../../env/shlink.env + - /etc/ixvd/secrets/env/shlink.env depends_on: - shlink-db networks: diff --git a/tools/repo/check-docker-compose.sh b/tools/repo/check-docker-compose.sh new file mode 100644 index 0000000..e1e0393 --- /dev/null +++ b/tools/repo/check-docker-compose.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +set -e + +for s in servers/*; do + echo "checking $s..." + HOSTNAME=$(echo $s | sed 's/servers\///') bash tools/server-docker-compose.sh config -q +done \ No newline at end of file diff --git a/tools/server-docker-compose.sh b/tools/server-docker-compose.sh index c58e5ff..30d011a 100644 --- a/tools/server-docker-compose.sh +++ b/tools/server-docker-compose.sh @@ -12,4 +12,4 @@ for f in servers/$HOSTNAME/docker-compose.d/*.yml; do dc_args="$dc_args -f $f" done -docker-compose $dc_args $@ \ No newline at end of file +exec docker-compose $dc_args $@ \ No newline at end of file