infrastructure/vwdump
1
0
Fork 0
mirror of https://github.com/xzeldon/vwdump.git synced 2025-06-28 22:58:16 +03:00
Code Issues

Merge branch 'ci' into 'master'

Browse Source 
Update ci

See merge request 1O/bitwarden_rs-backup!3
This commit is contained in:
Markus 2019-05-28 10:22:10 +00:00
commit e5bac59859
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci.yml
View File

@ -23,10 +23,10 @@ build_master:
<<: *docker_build <<: *docker_build
script: script:
- *docker_login - *docker_login
- docker build --pull -t "$IMAGE_NAME" -t "$IMAGE_NAME_DOCKERHUB" . - docker build --pull -t "$IMAGE_NAME" -t "$IMAGE_NAME_DOCKERHUB:${CI_COMMIT_TAG:-latest}" .
- docker push "$IMAGE_NAME" - docker push "$IMAGE_NAME"
- *dockerhub_login - *dockerhub_login
- docker push "$IMAGE_NAME_DOCKERHUB" - docker push "$IMAGE_NAME_DOCKERHUB:${CI_COMMIT_TAG:-latest}"
only: only:
- master - master
@ -34,10 +34,10 @@ build_master_rpi3:
<<: *docker_build <<: *docker_build
script: script:
- *docker_login - *docker_login
- docker build --pull -t "$IMAGE_NAME:rpi3" -t "$IMAGE_NAME_DOCKERHUB:rpi3" . - docker build --pull -t "$IMAGE_NAME:rpi3" -t "$IMAGE_NAME_DOCKERHUB:${CI_COMMIT_TAG:-latest}" .
- docker push "$IMAGE_NAME:rpi3" - docker push "$IMAGE_NAME:rpi3"
- *dockerhub_login - *dockerhub_login
- docker push "$IMAGE_NAME_DOCKERHUB:rpi3" - docker push "$IMAGE_NAME_DOCKERHUB:${CI_COMMIT_TAG-rpi3:-latest-rpi3}"
tags: tags:
- rpi3 - rpi3
only: only:
@ -47,8 +47,8 @@ build:
<<: *docker_build <<: *docker_build
script: script:
- *docker_login - *docker_login
- docker build --pull -t "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/bw_backup" . - docker build --pull -t "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/bw_backup:${CI_COMMIT_TAG:-latest}" .
- docker push "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/bw_backup" - docker push "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG/bw_backup:${CI_COMMIT_TAG:-latest}"
except: except:
- master - master