From a3d4a4336f33c55a4223f09c1e4674aa0c2569aa Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Sat, 24 Feb 2024 22:47:05 +1100
Subject: [PATCH] Updated .gitlab* files to be consistent with other projects

---
 .gitlab-ci.yml | 47 ++++++++++++++++++-----------------------------
 1 file changed, 18 insertions(+), 29 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 54ccc38..ce97146 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,40 +1,29 @@
-image: docker:latest
-
 stages:
-- test
 - build
+- build-manifest
 
 variables:
   VERSION: latest
-  CACHETAG: build
-  DOCKER_HOST: tcp://${CI_REGISTRY}-leenooks-ci-docker:2375
+  DOCKER_HOST: tcp://docker:2375
+  VERSIONARCH: ${VERSION}-${ARCH}
 
+cache:
+  key: ${CI_JOB_NAME_SLUG}-${CI_COMMIT_REF_SLUG}
+  paths:
+  - build-cache
+
+image: docker:latest
 services:
-- ${CI_REGISTRY}/leenooks/ci-docker:dind
+- docker:dind
 
 before_script:
-- docker info
-- docker version
+- 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
+- docker info && docker version
+# env|sort
 - echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
 
-test:
-  stage: test
-  script:
-  - cat /etc/hosts
-  - env|sort
-  - docker build -t ${CI_REGISTRY_IMAGE}:${VERSION} .
-  - docker images
-  only:
-  - debug
-
-build:
-  stage: build
-  script:
-  - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
-  - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
-  - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
-  - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
-  tags:
-  - docker
-  only:
-  - master
+include:
+- .gitlab-docker-x86_64.yml
+- .gitlab-docker-armv7l.yml