Compare commits

..

1 Commits

Author SHA1 Message Date
8dabc5e1c5 Merge branch 'develop' into feature_cicd_fix
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2021-11-23 17:38:16 +01:00

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,9 +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: #event:
#- pull_request #- pull_request
- push #- push
volumes: volumes:
- name: docker-sock - name: docker-sock
path: /var/run path: /var/run
@ -73,7 +73,6 @@ 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}
@ -83,6 +82,7 @@ steps:
- develop - develop
event: event:
- push - push
- pull_request
volumes: volumes:
- name: docker-sock - name: docker-sock
path: /var/run path: /var/run
@ -101,9 +101,7 @@ 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: event: pull_request
- pull_request
- push
volumes: volumes:
- name: docker-sock - name: docker-sock
path: /var/run path: /var/run