From 540b097fe6478a431d9a14ea5a58333cccf83561 Mon Sep 17 00:00:00 2001
From: fiftin <denguk@gmail.com>
Date: Thu, 4 Jul 2024 15:40:29 +0500
Subject: [PATCH] fix(docker): remove env var ANSIBLE_CONFIG and move
 ansible.cfg to /etc/ansible/ansible.cfg

---
 deployment/docker/debug/Dockerfile      | 2 +-
 deployment/docker/debug/server-wrapper  | 2 --
 deployment/docker/runner/Dockerfile     | 2 +-
 deployment/docker/runner/runner-wrapper | 1 -
 deployment/docker/server/Dockerfile     | 2 +-
 deployment/docker/server/server-wrapper | 1 -
 6 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/deployment/docker/debug/Dockerfile b/deployment/docker/debug/Dockerfile
index 0a7089148..f94202909 100644
--- a/deployment/docker/debug/Dockerfile
+++ b/deployment/docker/debug/Dockerfile
@@ -40,7 +40,7 @@ bash curl git gnupg mysql-client openssh-client-default python3 python3-dev py3-
     chown -R semaphore:0 /var/lib/semaphore && \
     chown -R semaphore:0 /opt/semaphore
 
-COPY --chown=1001:0 ./deployment/docker/debug/ansible.cfg /tmp/semaphore/ansible.cfg
+COPY --chown=1001:0 ./deployment/docker/debug/ansible.cfg /etc/ansible/ansible.cfg
 COPY --from=builder /go/src/semaphore/deployment/docker/debug/server-wrapper /usr/local/bin/
 COPY --from=builder /go/src/semaphore/bin/semaphore /usr/local/bin/
 COPY --from=builder /go/bin/dlv /
diff --git a/deployment/docker/debug/server-wrapper b/deployment/docker/debug/server-wrapper
index c6ddc8142..1703ff7fa 100755
--- a/deployment/docker/debug/server-wrapper
+++ b/deployment/docker/debug/server-wrapper
@@ -32,8 +32,6 @@ file_env() {
 }
 
 export SEMAPHORE_CONFIG_PATH="${SEMAPHORE_CONFIG_PATH:-/etc/semaphore}"
-export ANSIBLE_CONFIG="${ANSIBLE_CONFIG:-${SEMAPHORE_TMP_PATH}/ansible.cfg}"
-
 export SEMAPHORE_TMP_PATH="${SEMAPHORE_TMP_PATH:-/tmp/semaphore}"
 export SEMAPHORE_DB_DIALECT="${SEMAPHORE_DB_DIALECT:-mysql}"
 export SEMAPHORE_DB_HOST="${SEMAPHORE_DB_HOST:-0.0.0.0}"
diff --git a/deployment/docker/runner/Dockerfile b/deployment/docker/runner/Dockerfile
index 741f65b41..17c54edf1 100644
--- a/deployment/docker/runner/Dockerfile
+++ b/deployment/docker/runner/Dockerfile
@@ -63,7 +63,7 @@ RUN apk add --no-cache -U \
     chown -R semaphore:0 /opt/semaphore && \
     find /usr/lib/python* -iname __pycache__ | xargs rm -rf
 
-COPY --chown=1001:0 ./deployment/docker/runner/ansible.cfg /tmp/semaphore/ansible.cfg
+COPY --chown=1001:0 ./deployment/docker/runner/ansible.cfg /etc/ansible/ansible.cfg
 COPY --from=builder /go/src/semaphore/deployment/docker/runner/runner-wrapper /usr/local/bin/
 COPY --from=builder /go/src/semaphore/bin/semaphore /usr/local/bin/
 COPY --from=builder /tmp/tofu /usr/local/bin/
diff --git a/deployment/docker/runner/runner-wrapper b/deployment/docker/runner/runner-wrapper
index cba06c706..f1f138034 100644
--- a/deployment/docker/runner/runner-wrapper
+++ b/deployment/docker/runner/runner-wrapper
@@ -4,7 +4,6 @@ echoerr() { printf "%s\n" "$*" >&2; }
 
 export SEMAPHORE_CONFIG_PATH="${SEMAPHORE_CONFIG_PATH:-/etc/semaphore}"
 export SEMAPHORE_TMP_PATH="${SEMAPHORE_TMP_PATH:-/tmp/semaphore}"
-export ANSIBLE_CONFIG="${ANSIBLE_CONFIG:-${SEMAPHORE_TMP_PATH}/ansible.cfg}"
 
 if test -f "${SEMAPHORE_CONFIG_PATH}/packages.txt"; then
     echoerr "Installing additional system dependencies"
diff --git a/deployment/docker/server/Dockerfile b/deployment/docker/server/Dockerfile
index 32f8e28b2..ac6c6aff9 100644
--- a/deployment/docker/server/Dockerfile
+++ b/deployment/docker/server/Dockerfile
@@ -66,7 +66,7 @@ RUN apk add --no-cache -U \
     chown -R semaphore:0 /opt/semaphore && \
     find /usr/lib/python* -iname __pycache__ | xargs rm -rf
 
-COPY --chown=1001:0 ./deployment/docker/server/ansible.cfg /tmp/semaphore/ansible.cfg
+COPY --chown=1001:0 ./deployment/docker/server/ansible.cfg /etc/ansible/ansible.cfg
 COPY --from=builder /go/src/semaphore/deployment/docker/server/server-wrapper /usr/local/bin/
 COPY --from=builder /go/src/semaphore/bin/semaphore /usr/local/bin/
 COPY --from=builder /tmp/tofu /usr/local/bin/
diff --git a/deployment/docker/server/server-wrapper b/deployment/docker/server/server-wrapper
index 6a8426772..75a3f224a 100755
--- a/deployment/docker/server/server-wrapper
+++ b/deployment/docker/server/server-wrapper
@@ -33,7 +33,6 @@ file_env() {
 
 export SEMAPHORE_CONFIG_PATH="${SEMAPHORE_CONFIG_PATH:-/etc/semaphore}"
 export SEMAPHORE_TMP_PATH="${SEMAPHORE_TMP_PATH:-/tmp/semaphore}"
-export ANSIBLE_CONFIG="${ANSIBLE_CONFIG:-${SEMAPHORE_TMP_PATH}/ansible.cfg}"
 export SEMAPHORE_DB_DIALECT="${SEMAPHORE_DB_DIALECT:-mysql}"
 export SEMAPHORE_DB_HOST="${SEMAPHORE_DB_HOST:-0.0.0.0}"
 export SEMAPHORE_DB_PATH="${SEMAPHORE_DB_PATH:-/var/lib/semaphore}"