Merge branch 'develop' into feature_cicd_fix

.drone.yml

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