Enable armv7l build

This commit is contained in:
Deon George 2023-10-15 21:16:11 +11:00
parent 4a1d0e8e56
commit 3056a63348
3 changed files with 14 additions and 14 deletions

View File

@ -30,6 +30,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

View File

@ -15,15 +15,15 @@ armv7l:build:
only:
- alpine
armv7l:build-test:
variables:
ARCH: armv7l
stage: build-test
script:
- 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
- armv7l
only:
- alpine
#armv7l:build-test:
# variables:
# ARCH: armv7l
# stage: build-test
# script:
# - 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
# - armv7l
# only:
# - alpine

View File

@ -1,7 +1,7 @@
x86_64:build-manifest:
stage: build-manifest
script:
- 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 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
- if [ -n "${AUTO_BUILD}" ]; then curl -LX POST --post301 -F token=${TRIGGER_TOKEN} -F ref=pgsql ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/trigger/pipeline; fi