diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b53083f..b4b6fff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/.gitlab-docker-armv7l.yml b/.gitlab-docker-armv7l.yml index ae0484c..c54a007 100644 --- a/.gitlab-docker-armv7l.yml +++ b/.gitlab-docker-armv7l.yml @@ -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 diff --git a/.gitlab-docker-manifest.yml b/.gitlab-docker-manifest.yml index ba2312f..7444c23 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}-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