Merge branch 'develop' into feature_cicd_fix

.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
@@ -95,7 +101,9 @@ steps:
   - docker push docker.pbiernat.dev/nginx-php:$CI_COMMIT_BRANCH
   when:
     branch: develop
-    event: pull_request
+    event:
+    - pull_request
+    - push
   volumes:
   - name: docker-sock
     path: /var/run