.drone.yml

@@ -25,8 +25,8 @@ steps:
       from_secret: registry_password
   commands:
   - sleep 5
-#  - docker login docker.pbiernat.dev -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
-#  - docker push docker.pbiernat.dev/nginx-php
+  - docker login docker.pbiernat.dev -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
+  - docker push docker.pbiernat.dev/nginx-php
   when:
     event: tag
   volumes:
@@ -37,11 +37,12 @@ steps:
   image: plugins/docker
   commands:
   - sleep 5
-  #- env
-  - ./scripts/drone-build.sh
+  - docker build -t docker.pbiernat.dev/nginx-php:dev .
+  - docker images --format "{{.Repository}}:{{.Tag}}" | grep nginx-php:dev
   when:
     branch: develop
     event: 
+    - pull_request
     - push
   volumes:
   - name: docker-sock
@@ -49,7 +50,7 @@ steps:
 
 - name: publish_develop
   image: plugins/docker
-#  privileged: true
+  privileged: true
   environment:
     DOCKER_USERNAME:
       from_secret: registry_username
@@ -57,13 +58,12 @@ steps:
       from_secret: registry_password
   commands:
   - sleep 5
-#  - docker login docker.pbiernat.dev -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
-#  - docker push docker.pbiernat.dev/nginx-php:dev
-  - ./scripts/drone-publish.sh
+  - docker build -t docker.pbiernat.dev/nginx-php:dev .
+  - docker login docker.pbiernat.dev -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
+  - docker push docker.pbiernat.dev/nginx-php:dev
   when:
     branch: develop
-    event:
-    - push
+    event: push
   volumes:
   - name: docker-sock
     path: /var/run
@@ -71,40 +71,31 @@ 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}
-  - ./scripts/drone-build.sh
+  - 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_*
-    - develop
-    event:
-    - push
-    - pull_request
+    branch: feature_*
+    event: push
   volumes:
   - name: docker-sock
     path: /var/run
 
 - name: publish_feature
   image: plugins/docker
-#  privileged: true
+  privileged: true
   environment:
     DOCKER_USERNAME:
       from_secret: registry_username
     DOCKER_PASSWORD:
       from_secret: registry_password
   commands:
-#  - env
   - sleep 5
-  #- docker login docker.pbiernat.dev -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
-  #- docker push docker.pbiernat.dev/nginx-php:$CI_COMMIT_BRANCH
-  - ./scripts/drone-publish.sh
+  - docker login docker.pbiernat.dev -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
+  - docker push docker.pbiernat.dev/nginx-php:$CI_COMMIT_BRANCH
   when:
-    branch: develop
-    event:
-    - pull_request
+    branch: feature_*
+    event: pull_request
   volumes:
   - name: docker-sock
     path: /var/run

scripts/drone-build.sh

@@ -1,39 +0,0 @@
-#!/bin/sh
-
-#  - docker build -t docker.pbiernat.dev/nginx-php:$CI_COMMIT_BRANCH .
-#  - docker images --format "{{.Repository}}:{{.Tag}}" | grep nginx-php:${CI_COMMIT_BRANCH}
-
-
-contains() {
-    string="$1"
-    substring="$2"
-    if test "${string#*$substring}" != "$string"
-    then
-        return 0    # $substring is in $string
-    else
-        return 1    # $substring is not in $string
-    fi
-}
-
-branch=$CI_COMMIT_BRANCH
-event=$CI_BUILD_EVENT
-source_branch=$DRONE_SOURCE_BRANCH
-
-if { contains "$branch" "feature_" && [ "$event" = push ]; } ; then
-    echo "BUILD FEATURE: $branch"
-    docker build -t docker.pbiernat.dev/nginx-php:${branch} .
-    return 0
-fi
-
-if { [ "$branch" = develop ] && [ "$event" = pull_request ]; } ; then
-    echo "BUILD FEATURE(FROM DEV): $source_branch"
-    docker build -t docker.pbiernat.dev/nginx-php:$source_branch .
-    return 0
-fi
-
-if { [ "$branch" = develop ] && [ "$event" = push ]; } ; then
-    echo "BUILD DEV"
-    docker build -t docker.pbiernat.dev/nginx-php:dev .
-    return 0
-fi
-

scripts/drone-publish.sh

@@ -1,33 +0,0 @@
-#!/bin/sh
-
-# docker push docker.pbiernat.dev/nginx-php:$CI_COMMIT_BRANCH
-
-contains() {
-    string="$1"
-    substring="$2"
-    if test "${string#*$substring}" != "$string"
-    then
-        return 0    # $substring is in $string
-    else
-        return 1    # $substring is not in $string
-    fi
-}
-
-branch=$CI_COMMIT_BRANCH
-event=$CI_BUILD_EVENT
-source_branch=$DRONE_SOURCE_BRANCH
-
-docker login docker.pbiernat.dev -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
-
-if { [ "$branch" = develop ] && [ "$event" = pull_request ]; } ; then
-    echo "PUSH FEATURE: ${source_branch}"
-    docker push docker.pbiernat.dev/nginx-php:$source_branch
-    return 0
-fi
-
-if { [ "$branch" = develop ] && [ "$event" = push ]; } ; then
-    echo "PUSH DEV: $branch"
-    docker push docker.pbiernat.dev/nginx-php:dev
-    return 0
-fi
-