diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8f471360128f923db9614b1ba4539daa954784da..46b65ea453d9f309718971169115f31d2a5d41dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,9 +88,9 @@ tests: - cargo cucumber .deploy_docker_multiplatform: - stage: deploy + stage: labels rules: - - if: $CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_BRANCH =~ /^(release\/runtime-)[0-9].*/ + - if: $CI_PIPELINE_SOURCE != "merge_request_event" && $CI_COMMIT_BRANCH =~ /^(test\/cgeek-)[0-9].*/ when: manual changes: - node/specs/$CHAIN-raw.json @@ -99,16 +99,19 @@ tests: - sh -c "[ -n '$DUNITERTEAM_PASSWD' ] || ( echo No access to environment variable 'DUNITERTEAM_PASSWD'; exit 1 )" - podman login -u "duniterteam" -p "$DUNITERTEAM_PASSWD" docker.io script: - - export MILESTONE=$(echo release/runtime-700 | sed -e "s/release\///g") + - export MILESTONE=$(echo $CI_COMMIT_BRANCH | sed -e "s/test\///g") + - echo $MILESTONE - export MANIFEST=localhost/manifest-$IMAGE_NAME:$MILESTONE + - echo $MANIFEST - podman manifest rm "$MANIFEST" 2>/dev/null || true - podman build --layers --platform linux/amd64,linux/arm64 --manifest "$MANIFEST" -f docker/Dockerfile $PODMAN_BUILD_OPTIONS . - - podman manifest push --all "$MANIFEST" "docker://docker.io/$IMAGE_NAME:$MILESTONE" - - podman manifest push --all "$MANIFEST" "docker://docker.io/$IMAGE_NAME:latest" +# - podman manifest push --all "$MANIFEST" "docker://docker.io/$IMAGE_NAME:$MILESTONE" +# - podman manifest push --all "$MANIFEST" "docker://docker.io/$IMAGE_NAME:latest" after_script: - podman manifest rm "$MANIFEST" variables: IMAGE_NAME: "duniter/duniter-v2s-$CHAIN" + PODMAN_BUILD_OPTIONS: "--build-arg chain=$CHAIN" gdev_docker_deploy: extends: .deploy_docker_multiplatform