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