mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-15 07:22:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'opt-in-docker-push' into 'master'

Browse source 
gitlab-ci: make push in "docker" job opt-in

See merge request fdroid/fdroidserver!1182
This commit is contained in:
Jochen Sprickerhof 2022-09-08 15:58:39 +00:00
commit 707753a289
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
.gitlab-ci.yml
View file

@ -560,6 +560,10 @@ pages:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' # only publish pages on default (master) branch - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' # only publish pages on default (master) branch
# This job pushes the official CI docker image based on the master
# branch, so in fdroid/fdroidserver, it should only run on the master
# branch. Otherwise, tags or other branches will overwrite the docker
# image which is supposed to be what is in master.
docker: docker:
dependencies: dependencies:
- fdroid build - fdroid build
@ -568,6 +572,8 @@ docker:
- .gitlab-ci.yml - .gitlab-ci.yml
- makebuildserver - makebuildserver
- buildserver/* - buildserver/*
variables:
- $CI_COMMIT_BRANCH == "master" || $CI_PROJECT_NAMESPACE != "fdroid"
image: docker:git image: docker:git
services: services:
- docker:dind - docker:dind
@ -580,5 +586,10 @@ docker:
- docker tag $TEST_IMAGE $RELEASE_IMAGE - docker tag $TEST_IMAGE $RELEASE_IMAGE
- docker tag $TEST_IMAGE ${RELEASE_IMAGE}-stretch - docker tag $TEST_IMAGE ${RELEASE_IMAGE}-stretch
- echo $CI_BUILD_TOKEN | docker login -u gitlab-ci-token --password-stdin registry.gitlab.com - echo $CI_BUILD_TOKEN | docker login -u gitlab-ci-token --password-stdin registry.gitlab.com
# This avoids filling up gitlab.com free tier accounts with unused docker images.
- echo "Skipping docker push to save quota on your gitlab namespace."
- echo "If you want to enable the push, set FDROID_PUSH_DOCKER_IMAGE in"
- echo "https://gitlab.com/$CI_PROJECT_NAMESPACE/fdroidserver/-/settings/ci_cd#js-cicd-variables-settings"
- test -n "$FDROID_PUSH_DOCKER_IMAGE" || exit 0
- docker push $RELEASE_IMAGE - docker push $RELEASE_IMAGE
- docker push $RELEASE_IMAGE-stretch - docker push $RELEASE_IMAGE-stretch