Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-30 00:00:11 +01:00
Code Issues Releases Wiki Activity

fix(ci): Add missing dependency in deploy:docker stage

Browse source 
Signed-off-by: Steffen Vogel <steffen.vogel@opal-rt.com>
This commit is contained in:
Steffen Vogel 2024-10-31 11:46:11 +01:00
parent b011ae5cbe
commit dfa7017a83
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
.gitlab-ci.yml
View file

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