From 889b95f572f689da96a8e59a8c405e789e705f7d Mon Sep 17 00:00:00 2001 From: Clemens Date: Mon, 11 Mar 2024 14:41:15 +0100 Subject: [PATCH] revert env var renaming --- infrastructure/build/image/Dockerfile | 6 +++--- infrastructure/build/image/resources/entrypoint.sh | 10 +++++----- infrastructure/build/image/resources/functions.sh | 14 +++++++------- src/main/resources/website/build-configmap.yaml | 6 +++--- src/main/resources/website/build-secret.yaml | 2 +- src/test/cljc/dda/c4k_website/website_test.cljc | 8 ++++---- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/infrastructure/build/image/Dockerfile b/infrastructure/build/image/Dockerfile index 84e606e..8647345 100644 --- a/infrastructure/build/image/Dockerfile +++ b/infrastructure/build/image/Dockerfile @@ -3,9 +3,9 @@ FROM clojure:lein # Prepare Entrypoint Script ADD resources /tmp -ENV BUILD_DIR="/etc/website" -ENV SOURCE_DIR="/etc/websitesource" +ENV BUILDDIR="/etc/website" +ENV SOURCEDIR="/etc/websitesource" ENV WEBSITE_ROOT="/var/www/html/website/" -ENV HASHFILE_DIR="/var/hashfile.d" +ENV HASHFILEDIR="/var/hashfile.d" RUN /tmp/install.sh diff --git a/infrastructure/build/image/resources/entrypoint.sh b/infrastructure/build/image/resources/entrypoint.sh index e50684b..485a546 100755 --- a/infrastructure/build/image/resources/entrypoint.sh +++ b/infrastructure/build/image/resources/entrypoint.sh @@ -1,7 +1,7 @@ #!/bin/bash -mkdir $BUILD_DIR -mkdir $SOURCE_DIR +mkdir $BUILDDIR +mkdir $SOURCEDIR set -euo pipefail @@ -11,15 +11,15 @@ filename="website.zip" hashfilename="hashfile" echo "Check for new content" -touch $HASHFILE_DIR/$hashfilename -currentHash=$( cat $HASHFILE_DIR/$hashfilename ) +touch $HASHFILEDIR/$hashfilename +currentHash=$( cat $HASHFILEDIR/$hashfilename ) newHash=$( get-hash-data ) if [[ $currentHash == $newHash ]] then echo "Nothing to do" else - echo $currentHash > $HASHFILE_DIR/$hashfilename + echo $currentHash > $HASHFILEDIR/$hashfilename echo "Generate .netrc file" generate-netrc-file echo "Downloading website data" diff --git a/infrastructure/build/image/resources/functions.sh b/infrastructure/build/image/resources/functions.sh index 60f192d..10a43ad 100644 --- a/infrastructure/build/image/resources/functions.sh +++ b/infrastructure/build/image/resources/functions.sh @@ -1,29 +1,29 @@ #!/bin/bash function generate-netrc-file() { - echo "machine $GIT_HOST password $AUTH_TOKEN" > ~/.netrc + echo "machine $GITHOST password $AUTHTOKEN" > ~/.netrc } function get-website-data() { - curl -H "Authorization: token $AUTH_TOKEN" -o $SOURCE_DIR/$1 $GIT_REPO_URL + curl -H "Authorization: token $AUTHTOKEN" -o $SOURCEDIR/$1 $GITREPOURL } function get-hash-data() { - curl -s -H "Authorization: token $AUTH_TOKEN" $GIT_COMMIT_URL | jq '.sha' + curl -s -H "Authorization: token $AUTHTOKEN" $GITCOMMITURL | jq '.sha' } function write-hash-data() { - echo $1 > $HASHFILE_DIR/$2 + echo $1 > $HASHFILEDIR/$2 } function unzip-website-data() { - unzip $SOURCE_DIR/$1 -d $BUILD_DIR + unzip $SOURCEDIR/$1 -d $BUILDDIR } function build-website() { - (cd $BUILD_DIR; dir=$(ls); cd $dir; ./generate.sh;) + (cd $BUILDDIR; dir=$(ls); cd $dir; ./generate.sh;) } function move-website-files-to-target() { - (cd $BUILD_DIR; dir=$(ls); cd $dir; rsync -ru --exclude-from "/etc/exclude.pattern" --delete target/html/* $WEBSITE_ROOT;) + (cd $BUILDDIR; dir=$(ls); cd $dir; rsync -ru --exclude-from "/etc/exclude.pattern" --delete target/html/* $WEBSITE_ROOT;) } diff --git a/src/main/resources/website/build-configmap.yaml b/src/main/resources/website/build-configmap.yaml index f3a812a..6c877cc 100644 --- a/src/main/resources/website/build-configmap.yaml +++ b/src/main/resources/website/build-configmap.yaml @@ -6,6 +6,6 @@ metadata: labels: app.kubernetes.part-of: NAME-website data: - GIT_HOST: GITHOST - GIT_REPO_URL: REPOURL - GIT_COMMIT_URL: COMMITURL \ No newline at end of file + GITHOST: GITHOST + GITREPOURL: REPOURL + GITCOMMITURL: COMMITURL \ No newline at end of file diff --git a/src/main/resources/website/build-secret.yaml b/src/main/resources/website/build-secret.yaml index 71bec46..de659ef 100644 --- a/src/main/resources/website/build-secret.yaml +++ b/src/main/resources/website/build-secret.yaml @@ -6,4 +6,4 @@ metadata: labels: app.kubernetes.part-of: NAME-website data: - AUTH_TOKEN: TOKEN + AUTHTOKEN: TOKEN diff --git a/src/test/cljc/dda/c4k_website/website_test.cljc b/src/test/cljc/dda/c4k_website/website_test.cljc index 47a93d9..b052adf 100644 --- a/src/test/cljc/dda/c4k_website/website_test.cljc +++ b/src/test/cljc/dda/c4k_website/website_test.cljc @@ -236,9 +236,9 @@ :namespace "test-io", :labels {:app.kubernetes.part-of "test-io-website"}}, :data - {:GIT_HOST "mygit.de" - :GIT_REPO_URL "https://mygit.de/api/v1/repos/someuser/repo/archive/main.zip" - :GIT_COMMIT_URL "https://mygit.de/api/v1/repos/someuser/repo/git/commits/HEAD"}} + {:GITHOST "mygit.de" + :GITREPOURL "https://mygit.de/api/v1/repos/someuser/repo/archive/main.zip" + :GITCOMMITURL "https://mygit.de/api/v1/repos/someuser/repo/git/commits/HEAD"}} (cut/generate-build-configmap {:issuer "staging" :build-cpu-request "500m" :build-cpu-limit "1700m" @@ -260,7 +260,7 @@ :namespace "test-io", :labels {:app.kubernetes.part-of "test-io-website"}}, :data - {:AUTH_TOKEN "YWJlZGpnYmFzZG9kag=="}} + {:AUTHTOKEN "YWJlZGpnYmFzZG9kag=="}} (cut/generate-build-secret {:unique-name "test.io", :authtoken "abedjgbasdodj"}))))