Compare commits

...

2 Commits

Author SHA1 Message Date
69465498ad Merge branch 'develop' into feature_cicd_fix
Some checks failed
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is failing
2021-11-23 17:53:18 +01:00
6bc615549f Merge pull request '[fix] Publish feature tagged image on PR open' (#11) from feature_cicd_fix into develop
All checks were successful
continuous-integration/drone/push Build is passing
Reviewed-on: https://git.pbiernat.dev/docker/nginx-php/pulls/11
2021-11-23 14:41:32 +00:00

View File

@ -63,7 +63,9 @@ steps:
- docker push docker.pbiernat.dev/nginx-php:dev - docker push docker.pbiernat.dev/nginx-php:dev
when: when:
branch: develop branch: develop
event: push event:
#- pull_request
- push
volumes: volumes:
- name: docker-sock - name: docker-sock
path: /var/run path: /var/run
@ -71,12 +73,16 @@ steps:
- name: build_feature - name: build_feature
image: plugins/docker image: plugins/docker
commands: commands:
- env
- sleep 5 - sleep 5
- docker build -t docker.pbiernat.dev/nginx-php:$CI_COMMIT_BRANCH . - docker build -t docker.pbiernat.dev/nginx-php:$CI_COMMIT_BRANCH .
- docker images --format "{{.Repository}}:{{.Tag}}" | grep nginx-php:${CI_COMMIT_BRANCH} - docker images --format "{{.Repository}}:{{.Tag}}" | grep nginx-php:${CI_COMMIT_BRANCH}
when: when:
branch: feature_* branch:
event: push - feature_*
- develop
event:
- push
volumes: volumes:
- name: docker-sock - name: docker-sock
path: /var/run path: /var/run
@ -95,7 +101,9 @@ steps:
- docker push docker.pbiernat.dev/nginx-php:$CI_COMMIT_BRANCH - docker push docker.pbiernat.dev/nginx-php:$CI_COMMIT_BRANCH
when: when:
branch: develop branch: develop
event: pull_request event:
- pull_request
- push
volumes: volumes:
- name: docker-sock - name: docker-sock
path: /var/run path: /var/run