From 12431f6c2e33448c6023c11260a01de6f6493314 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Sat, 4 Feb 2023 23:38:08 +1100
Subject: [PATCH] Disable armv7l builds and arm64 test builds

---
 .gitlab-ci.yml              |  2 +-
 .gitlab-docker-arm64.yml    | 24 ++++++++++++------------
 .gitlab-docker-manifest.yml |  4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index db63899..e7b6172 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -31,6 +31,6 @@ before_script:
 
 include:
 - .gitlab-docker-x86_64.yml
-- .gitlab-docker-armv7l.yml
+# .gitlab-docker-armv7l.yml
 - .gitlab-docker-arm64.yml
 - .gitlab-docker-manifest.yml
diff --git a/.gitlab-docker-arm64.yml b/.gitlab-docker-arm64.yml
index 7949e3f..0b1aa3c 100644
--- a/.gitlab-docker-arm64.yml
+++ b/.gitlab-docker-arm64.yml
@@ -14,15 +14,15 @@ arm64:build:
   only:
   - alpine
 
-arm64:build-test:
-  variables:
-    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 push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test
-  tags:
-  - docker
-  - arm64
-  only:
-  - alpine
+#arm64:build-test:
+#  variables:
+#    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 push ${CI_REGISTRY_IMAGE}:${VERSIONARCH}-test
+#  tags:
+#  - docker
+#  - arm64
+#  only:
+#  - alpine
diff --git a/.gitlab-docker-manifest.yml b/.gitlab-docker-manifest.yml
index 6db77ab..7e97d35 100644
--- a/.gitlab-docker-manifest.yml
+++ b/.gitlab-docker-manifest.yml
@@ -1,7 +1,7 @@
 x86_64:build-manifest:
   stage: build-manifest
   script:
-  - docker manifest create ${CI_REGISTRY_IMAGE}:${VERSION} ${CI_REGISTRY_IMAGE}:${VERSION}-armv7l ${CI_REGISTRY_IMAGE}:${VERSION}-x86_64 ${CI_REGISTRY_IMAGE}:${VERSION}-arm64
+  - docker manifest create ${CI_REGISTRY_IMAGE}:${VERSION} ${CI_REGISTRY_IMAGE}:${VERSION}-x86_64 ${CI_REGISTRY_IMAGE}:${VERSION}-arm64 #${CI_REGISTRY_IMAGE}:${VERSION}-armv7l
   - docker manifest push --purge ${CI_REGISTRY_IMAGE}:${VERSION}
   - apk add --no-cache curl
   - echo curl -LX POST --post301 -F token=${TRIGGER_TOKEN} -F ref=pgsql ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/trigger/pipeline
@@ -17,7 +17,7 @@ x86_64:build-manifest:
 x86_64:build-manifest-test:
   stage: build-manifest-test
   script:
-  - docker manifest create ${CI_REGISTRY_IMAGE}:${VERSION}-test ${CI_REGISTRY_IMAGE}:${VERSION}-armv7l-test ${CI_REGISTRY_IMAGE}:${VERSION}-x86_64-test ${CI_REGISTRY_IMAGE}:${VERSION}-arm64-test
+  - docker manifest create ${CI_REGISTRY_IMAGE}:${VERSION}-test ${CI_REGISTRY_IMAGE}:${VERSION}-x86_64-test #${CI_REGISTRY_IMAGE}:${VERSION}-arm64-test #${CI_REGISTRY_IMAGE}:${VERSION}-armv7l-test
   - docker manifest push --purge ${CI_REGISTRY_IMAGE}:${VERSION}-test
   tags:
   - docker