mirror of
https://github.com/xzeldon/vwdump.git
synced 2025-06-28 01:48:14 +03:00
Merge branch 'dev'
This commit is contained in:
commit
b7c6cac02a
@ -2,11 +2,6 @@ stages:
|
|||||||
- push:readme
|
- push:readme
|
||||||
- build:docker
|
- build:docker
|
||||||
|
|
||||||
workflow:
|
|
||||||
rules:
|
|
||||||
- if: '$CI_PIPELINE_SOURCE == "push"'
|
|
||||||
- if: $CI_COMMIT_TAG
|
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
DOCKERHUB_REGISTRY: index.docker.io
|
DOCKERHUB_REGISTRY: index.docker.io
|
||||||
DOCKERHUB_REPO: bw_backup
|
DOCKERHUB_REPO: bw_backup
|
||||||
@ -58,7 +53,7 @@ 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_COMMIT_BRANCH == "master"'
|
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "master"
|
||||||
changes:
|
changes:
|
||||||
- README.md
|
- README.md
|
||||||
|
|
||||||
@ -93,7 +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" || $CI_COMMIT_TAG'
|
- if: $CI_COMMIT_BRANCH != "master"
|
||||||
when: never
|
|
||||||
- when: on_success
|
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user