Updated 'feature_cicd_fix' #13

Closed
keedosn wants to merge 2 commits from feature_cicd_fix into develop

View File

@ -41,9 +41,9 @@ steps:
- docker images --format "{{.Repository}}:{{.Tag}}" | grep nginx-php:dev
when:
branch: develop
event:
- pull_request
- push
#event:
#- pull_request
#- push
volumes:
- name: docker-sock
path: /var/run
@ -63,7 +63,9 @@ steps:
- docker push docker.pbiernat.dev/nginx-php:dev
when:
branch: develop
event: push
#event:
#- pull_request
#- push
volumes:
- name: docker-sock
path: /var/run
@ -75,8 +77,12 @@ steps:
- docker build -t docker.pbiernat.dev/nginx-php:$CI_COMMIT_BRANCH .
- docker images --format "{{.Repository}}:{{.Tag}}" | grep nginx-php:${CI_COMMIT_BRANCH}
when:
branch: feature_*
event: push
branch:
- feature_*
- develop
event:
- push
- pull_request
volumes:
- name: docker-sock
path: /var/run