Changed implementation of example on #13 since docker-compose 1.22.0 …

…(ships with Fedora 30) doesn't support --env-file param
wardenenv · Jan 30, 2020 · e658898 · e658898
1 parent 5073c5b
commit e658898
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 17 deletions.
diff --git a/commands/down.cmd b/commands/down.cmd
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 [[ ! ${WARDEN_COMMAND} ]] && >&2 echo -e "\033[31mThis script is not intended to be run directly!" && exit 1
 
-pushd "${WARDEN_DIR}" >/dev/null
-docker-compose -p warden --env-file "${WARDEN_HOME_DIR}/.env" \
-  -f docker/docker-compose.yml down "${WARDEN_PARAMS[@]}" "$@"
+pushd "${WARDEN_HOME_DIR}" >/dev/null
+docker-compose -p warden -f "${WARDEN_DIR}/docker/docker-compose.yml" down "${WARDEN_PARAMS[@]}" "$@"
diff --git a/commands/restart.cmd b/commands/restart.cmd
@@ -4,6 +4,5 @@
 source "${WARDEN_DIR}/utils/install.sh"
 assertWardenInstall
 
-pushd "${WARDEN_DIR}" >/dev/null
-docker-compose -p warden --env-file "${WARDEN_HOME_DIR}/.env" \
-  -f docker/docker-compose.yml restart "${WARDEN_PARAMS[@]}" "$@"
+pushd "${WARDEN_HOME_DIR}" >/dev/null
+docker-compose -p warden -f "${WARDEN_DIR}/docker/docker-compose.yml" restart "${WARDEN_PARAMS[@]}" "$@"
diff --git a/commands/sign-certificate.cmd b/commands/sign-certificate.cmd
@@ -50,8 +50,7 @@ openssl x509 -req -days 365 -sha256 -extensions v3_req            \
   -in "${WARDEN_SSL_DIR}/certs/${CERTIFICATE_NAME}.csr.pem"       \
   -out "${WARDEN_SSL_DIR}/certs/${CERTIFICATE_NAME}.crt.pem" 
 
-if [[ "$(cd "${WARDEN_DIR}" && docker-compose -p warden --env-file "${WARDEN_HOME_DIR}/.env" \
-    -f docker/docker-compose.yml ps -q traefik)" ]]
+if [[ "$(cd "${WARDEN_HOME_DIR}" && docker-compose -p warden -f "${WARDEN_DIR}/docker/docker-compose.yml" ps -q traefik)" ]]
 then
   echo "==> Updating traefik"
   "${WARDEN_DIR}/bin/warden" up traefik

diff --git a/commands/start.cmd b/commands/start.cmd
@@ -4,6 +4,5 @@
 source "${WARDEN_DIR}/utils/install.sh"
 assertWardenInstall
 
-pushd "${WARDEN_DIR}" >/dev/null
-docker-compose -p warden --env-file "${WARDEN_HOME_DIR}/.env" \
-  -f docker/docker-compose.yml start "${WARDEN_PARAMS[@]}" "$@"
+pushd "${WARDEN_HOME_DIR}" >/dev/null
+docker-compose -p warden -f "${WARDEN_DIR}/docker/docker-compose.yml" start "${WARDEN_PARAMS[@]}" "$@"
diff --git a/commands/stop.cmd b/commands/stop.cmd
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 [[ ! ${WARDEN_COMMAND} ]] && >&2 echo -e "\033[31mThis script is not intended to be run directly!" && exit 1
 
-pushd "${WARDEN_DIR}" >/dev/null
-docker-compose -p warden --env-file "${WARDEN_HOME_DIR}/.env" \
-  -f docker/docker-compose.yml stop "${WARDEN_PARAMS[@]}" "$@"
+pushd "${WARDEN_HOME_DIR}" >/dev/null
+docker-compose -p warden -f "${WARDEN_DIR}/docker/docker-compose.yml" stop "${WARDEN_PARAMS[@]}" "$@"
diff --git a/commands/up.cmd b/commands/up.cmd
@@ -21,6 +21,5 @@ for cert in $(find "${WARDEN_SSL_DIR}/certs" -type f -name "*.crt.pem" | sed -E
 	EOF
 done
 
-pushd "${WARDEN_DIR}" >/dev/null
-docker-compose -p warden --env-file "${WARDEN_HOME_DIR}/.env" \
-  -f docker/docker-compose.yml up -d "${WARDEN_PARAMS[@]}" "$@"
+pushd "${WARDEN_HOME_DIR}" >/dev/null
+docker-compose -p warden -f "${WARDEN_DIR}/docker/docker-compose.yml" up -d "${WARDEN_PARAMS[@]}" "$@"