docker/nginx-php
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated 'feature_cicd_fix' #13

Closed
keedosn wants to merge 2 commits from feature_cicd_fix into develop
pull from: feature_cicd_fix
merge into: docker:develop
Conversation 0 Commits 2 Files Changed 1 +12 -6
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8dabc5e1c5 - Show all commits

18
.drone.yml
View File

@ -41,9 +41,9 @@ steps:
- docker images --format "{{.Repository}}:{{.Tag}}" | grep nginx-php:dev - docker images --format "{{.Repository}}:{{.Tag}}" | grep nginx-php:dev
when: when:
branch: develop branch: develop
event: #event:
- pull_request #- pull_request
- push #- push
volumes: volumes:
- name: docker-sock - name: docker-sock
path: /var/run path: /var/run
@ -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
@ -75,8 +77,12 @@ steps:
- 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
- pull_request
volumes: volumes:
- name: docker-sock - name: docker-sock
path: /var/run path: /var/run