From 37ea3ed2af4f05ad1adf012a652ebe0fc9251211 Mon Sep 17 00:00:00 2001
From: Ilya Kreymer <ikreymer@gmail.com>
Date: Thu, 16 Jun 2022 22:36:44 -0700
Subject: [PATCH] config/scripts: - additional fixes to signing.yml config -
 add missing 'set -o allexport' before 'source'

---
 configs/docker-compose.signing.yml | 8 +++++---
 scripts/build-swarm.sh             | 1 +
 scripts/run-podman.sh              | 1 +
 scripts/run-swarm.sh               | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/configs/docker-compose.signing.yml b/configs/docker-compose.signing.yml
index c764d905..ed1c3c42 100644
--- a/configs/docker-compose.signing.yml
+++ b/configs/docker-compose.signing.yml
@@ -4,14 +4,16 @@ version: "3.8"
 
 services:
   authsign:
-    image: ${REGISTRY}webrecorder/authsign:${AUTHSIGN_TAG:-latest}
+    image: webrecorder/authsign:${AUTHSIGN_TAG:-latest}
 
     volumes:
       - btrix-sign-data:/data
-      - ./configs/signing.yaml:/app-config/signing.yaml
+      - ./configs/signing.yaml:/app-config/signing.yaml:z
 
     environment:
       - CONFIG=/app-config/signing.yaml
+
+      # optional token for authenticating access to authsign
       - AUTH_TOKEN=${WACZ_SIGN_TOKEN}
 
     env_file:
@@ -24,7 +26,7 @@ services:
 
   backend:
     environment:
-      - WACZ_SIGN_URL="http://authsign:8080/sign"
+      - WACZ_SIGN_URL=${WACZ_SIGN_URL}
 
       # optional token for authenticating access to authsign
       - WACZ_SIGN_TOKEN=${WACZ_SIGN_TOKEN}
diff --git a/scripts/build-swarm.sh b/scripts/build-swarm.sh
index ae268dd8..432398b7 100755
--- a/scripts/build-swarm.sh
+++ b/scripts/build-swarm.sh
@@ -2,6 +2,7 @@
 
 CURR=$(dirname "${BASH_SOURCE[0]}")
 
+set -o allexport
 source $CURR/../config.env
 
 if [ -n $REGISTRY ]; then
diff --git a/scripts/run-podman.sh b/scripts/run-podman.sh
index 5ebd9dc0..1a4e9483 100755
--- a/scripts/run-podman.sh
+++ b/scripts/run-podman.sh
@@ -6,6 +6,7 @@ compose=docker-compose
 
 CURR=$(dirname "${BASH_SOURCE[0]}")
 
+set -o allexport
 source $CURR/../configs/config.env
 
 export SOCKET_SRC=${XDG_RUNTIME_DIR}/podman/podman.sock
diff --git a/scripts/run-swarm.sh b/scripts/run-swarm.sh
index 96a651c1..db417c61 100755
--- a/scripts/run-swarm.sh
+++ b/scripts/run-swarm.sh
@@ -5,6 +5,7 @@
 
 CURR=$(dirname "${BASH_SOURCE[0]}")
 
+set -o allexport
 source $CURR/../configs/config.env
 
 docker swarm init