diff --git a/.drone.yml b/.drone.yml index 09bf139..3fbf085 100644 --- a/.drone.yml +++ b/.drone.yml @@ -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 @@ -71,12 +73,16 @@ steps: - name: build_feature image: plugins/docker commands: + - env - sleep 5 - 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 volumes: - name: docker-sock path: /var/run @@ -94,8 +100,10 @@ steps: - docker login docker.pbiernat.dev -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - docker push docker.pbiernat.dev/nginx-php:$CI_COMMIT_BRANCH when: - branch: feature_* - event: pull_request + branch: develop + event: + - pull_request + - push volumes: - name: docker-sock path: /var/run