Merge branch 'develop' into feature_cicd_fix

2021-11-23 15:43:39 +01:00 · 2021-11-23 15:43:39 +01:00 · 8dabc5e1c5
commit 8dabc5e1c5
parent 197cfeba33 6bc615549f
1 changed files with 12 additions and 6 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -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