1
0
mirror of https://github.com/xzeldon/vwdump.git synced 2025-06-28 03:08:14 +03:00

master to main

This commit is contained in:
1O 2021-04-05 18:33:54 +02:00
parent aa133a44eb
commit 762026a5ad
No known key found for this signature in database
GPG Key ID: 6D48F9802A5457C8

View File

@ -53,11 +53,11 @@ push_readme:
-e PUSHRM_TARGET=docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO -e PUSHRM_TARGET=docker.io/$DOCKERHUB_USER/$DOCKERHUB_REPO
chko/docker-pushrm chko/docker-pushrm
rules: rules:
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "master" - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "main"
changes: changes:
- README.md - README.md
build_master: build_main:
<<: *docker_build <<: *docker_build
script: script:
- *docker_login - *docker_login
@ -71,7 +71,7 @@ build_master:
#- docker push "$IMAGE_NAME" #- docker push "$IMAGE_NAME"
#- docker push "$IMAGE_NAME_DOCKERHUB:${CI_COMMIT_TAG:-latest}" #- docker push "$IMAGE_NAME_DOCKERHUB:${CI_COMMIT_TAG:-latest}"
rules: rules:
- if: '$CI_COMMIT_BRANCH == "master" || $CI_COMMIT_TAG' - if: '$CI_COMMIT_BRANCH == "main" || $CI_COMMIT_TAG'
changes: changes:
- Dockerfile - Dockerfile
- backup.sh - backup.sh
@ -88,4 +88,4 @@ build:
--tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" . --tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME" .
#- docker push "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/bw_backup:${CI_COMMIT_TAG:-latest}" #- docker push "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/bw_backup:${CI_COMMIT_TAG:-latest}"
rules: rules:
- if: $CI_COMMIT_BRANCH != "master" - if: $CI_COMMIT_BRANCH != "main"