From f5e4c8e30007bdedc4f6b7195be202aa08c6c9fb Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Fri, 30 Jun 2023 23:00:29 +1000
Subject: [PATCH] HTTP_PROXY can now be defined with a variable

---
 .gitlab-ci.yml            | 4 ++--
 .gitlab-docker-arm64.yml  | 4 ++--
 .gitlab-docker-armv7l.yml | 4 ++--
 .gitlab-docker-x86_64.yml | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d338a0..b53083f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,8 +21,8 @@ services:
 
 before_script:
 - if [ ! -d build-cache ]; then mkdir build-cache; fi
-- sed -i -e s'/https/http/' /etc/apk/repositories
-- HTTP_PROXY=http://proxy.dege.lan:3128 apk add git curl
+- if [ -n "${HTTP_PROXY}" ]; then echo "HTTP PROXY [${HTTP_PROXY}]"; sed -i -e s'/https/http/' /etc/apk/repositories; fi
+- apk add git curl
 - docker info && docker version
 # env|sort
 # docker login -u "$CI_DEPENDENCY_PROXY_USER" -p "$CI_DEPENDENCY_PROXY_PASSWORD" "$CI_SERVER_HOST"
diff --git a/.gitlab-docker-arm64.yml b/.gitlab-docker-arm64.yml
index b2a780e..5a066ff 100644
--- a/.gitlab-docker-arm64.yml
+++ b/.gitlab-docker-arm64.yml
@@ -6,7 +6,7 @@ arm64:build:
   - if [ -f init ]; then chmod 500 init; fi
   - ([ -z "$REFRESH" -a -f build-cache/${CI_COMMIT_REF_SLUG} ]) && docker load < build-cache/${CI_COMMIT_REF_SLUG} || true
   - rm build-cache/* || true
-  - docker build --build-arg HTTP_PROXY=http://proxy.dege.lan:3128 --cache-from ${CI_REGISTRY_IMAGE}:${VERSIONARCH} -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH} .
+  - docker build ${HTTP_PROXY:+--build-arg HTTP_PROXY=${HTTP_PROXY}} --cache-from ${CI_REGISTRY_IMAGE}:${VERSIONARCH} -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH} .
   - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}
   - docker save ${CI_REGISTRY_IMAGE}:${VERSIONARCH} > build-cache/${CI_COMMIT_REF_SLUG}
   tags:
@@ -20,7 +20,7 @@ arm64:build:
 #    ARCH: arm64
 #  stage: build-test
 #  script:
-#  - docker build --build-arg HTTP_PROXY=http://proxy.dege.lan:3128 --file Dockerfile.phptest -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test .
+#  - docker build ${HTTP_PROXY:+--build-arg HTTP_PROXY=${HTTP_PROXY}} --file Dockerfile.phptest -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test .
 #  - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test
 #  tags:
 #  - docker
diff --git a/.gitlab-docker-armv7l.yml b/.gitlab-docker-armv7l.yml
index 49a34a4..ae0484c 100644
--- a/.gitlab-docker-armv7l.yml
+++ b/.gitlab-docker-armv7l.yml
@@ -6,7 +6,7 @@ armv7l:build:
   - if [ -f init ]; then chmod 500 init; fi
   - ([ -z "$REFRESH" -a -f build-cache/${CI_COMMIT_REF_SLUG} ]) && docker load < build-cache/${CI_COMMIT_REF_SLUG} || true
   - rm build-cache/* || true
-  - docker build --build-arg HTTP_PROXY=http://proxy.dege.lan:3128 --cache-from ${CI_REGISTRY_IMAGE}:${VERSIONARCH} -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH} .
+  - docker build ${HTTP_PROXY:+--build-arg HTTP_PROXY=${HTTP_PROXY}} --cache-from ${CI_REGISTRY_IMAGE}:${VERSIONARCH} -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH} .
   - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}
   - docker save ${CI_REGISTRY_IMAGE}:${VERSIONARCH} > build-cache/${CI_COMMIT_REF_SLUG}
   tags:
@@ -20,7 +20,7 @@ armv7l:build-test:
     ARCH: armv7l
   stage: build-test
   script:
-  - docker build --build-arg HTTP_PROXY=http://proxy.dege.lan:3128 --file Dockerfile.phptest -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test .
+  - docker build ${HTTP_PROXY:+--build-arg HTTP_PROXY=${HTTP_PROXY}} --file Dockerfile.phptest -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test .
   - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test
   tags:
   - docker
diff --git a/.gitlab-docker-x86_64.yml b/.gitlab-docker-x86_64.yml
index 6786754..ee944ba 100644
--- a/.gitlab-docker-x86_64.yml
+++ b/.gitlab-docker-x86_64.yml
@@ -6,7 +6,7 @@ x86_64:build:
   - if [ -f init ]; then chmod 500 init; fi
   - ([ -z "$REFRESH" -a -f build-cache/${CI_COMMIT_REF_SLUG} ]) && docker load < build-cache/${CI_COMMIT_REF_SLUG} || true
   - rm build-cache/* || true
-  - docker build --build-arg HTTP_PROXY=http://proxy.dege.lan:3128 --cache-from ${CI_REGISTRY_IMAGE}:${VERSIONARCH} -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH} .
+  - docker build ${HTTP_PROXY:+--build-arg HTTP_PROXY=${HTTP_PROXY}} --cache-from ${CI_REGISTRY_IMAGE}:${VERSIONARCH} -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH} .
   - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}
   - docker save ${CI_REGISTRY_IMAGE}:${VERSIONARCH} > build-cache/${CI_COMMIT_REF_SLUG}
   tags:
@@ -20,7 +20,7 @@ x86_64:build-test:
     ARCH: x86_64
   stage: build-test
   script:
-  - docker build --build-arg HTTP_PROXY=http://proxy.dege.lan:3128 --file Dockerfile.phptest -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test .
+  - docker build ${HTTP_PROXY:+--build-arg HTTP_PROXY=${HTTP_PROXY}} --file Dockerfile.phptest -t ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test .
   - docker push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test
   tags:
   - docker