From 01568aef51470812bd1a94c9dd78081337808144 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <steffen.vogel@opal-rt.com>
Date: Thu, 31 Oct 2024 11:46:11 +0100
Subject: [PATCH] fix(ci): Add missing dependency in deploy:docker stage

Signed-off-by: Steffen Vogel <steffen.vogel@opal-rt.com>
---
 .gitlab-ci.yml | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7377560d0..5a638c236 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,7 +4,7 @@
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
   GIT_DEPTH: 0
-  DISTRO: fedora # standard distro
+  DISTRO: fedora # Standard distribution
   DOCKER_FILE: packaging/docker/Dockerfile.${DISTRO}
   DOCKER_TAG: ${CI_COMMIT_REF_NAME}
   DOCKER_IMAGE: registry.git.rwth-aachen.de/acs/public/villas/node
@@ -162,7 +162,6 @@ pkg:docker:
   stage: packaging
   before_script:
     - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
-    # - docker run --rm --privileged docker.io/aptman/qus -s -- -p
   script:
     - docker build ${DOCKER_OPTS}
       --pull
@@ -190,17 +189,6 @@ pkg:docker:
         ARCH: arm64
         TRIPLET: aarch64-linux-gnu
         TAG: pi5
-      # - DISTRO: debian
-      #   PLATFORM: linux/arm/v7
-      #   ARCH: armhf
-      #   TRIPLET: arm-linux-gnueabihf
-      #   DOCKER_FILE: packaging/docker/Dockerfile.debian-multiarch
-      # - DISTRO: debian
-      #   PLATFORM: linux/arm64/v8
-      #   ARCH: arm64
-      #   TRIPLET: aarch64-linux-gnu
-      #   DOCKER_FILE: packaging/docker/Dockerfile.debian-multiarch
-
   needs: []
 
 # Stage: deploy
@@ -214,14 +202,12 @@ deploy:docker:
     - docker manifest create ${DOCKER_IMAGE}:${DOCKER_TAG}
       ${DOCKER_IMAGE}:${DOCKER_TAG}-x86_64
       ${DOCKER_IMAGE}:${DOCKER_TAG}-arm64
-    # ${DOCKER_IMAGE}:${DOCKER_TAG}-armhf
     - docker manifest push   ${DOCKER_IMAGE}:${DOCKER_TAG}
   tags:
     - docker
   needs:
-    # - job: "pkg:docker: [debian, linux/arm64/v8, arm64, aarch64-linux-gnu, packaging/docker/Dockerfile.debian-multiarch]"
-    # - job: "pkg:docker: [debian, linux/arm/v7, armhf, arm-linux-gnueabihf, packaging/docker/Dockerfile.debian-multiarch]"
     - job: "pkg:docker: [debian, linux/amd64, x86_64, x86_64-linux-gnu, docker]"
+    - job: "pkg:docker: [debian, linux/arm64/v8, arm64, aarch64-linux-gnu, pi5]"
 
 deploy:docker-dev:
   stage: deploy