Merge branch 'dev/ci-docker-builder' into develop

.drone.yml

@@ -32,53 +32,13 @@ steps:
 - name: build_image
   image: plugins/docker
   commands:
-  - echo "develop" | grep -s '/'
-  - echo "develop/fix" | grep -s '/'
-  - echo "develop" | grep -s -v '/'
-  - echo "develop/fix" | grep -s -v '/'
-  # - simple=$(echo $CI_COMMIT_BRANCH | grep '/') ;
-  #   p1=$(echo $CI_COMMIT_BRANCH | cut -d '/' -f1 -s) &&
-  #   p2=$(echo $CI_COMMIT_BRANCH | cut -d '/' -f2 -s) &&
-  #   tag=${simple:-$p1-$p2} &&
-  #   docker build -t git.pbiernat.dev/golang/vegvisir:$tag -f Dockerfile.build .
-  volumes:
-  - name: docker-sock
-    path: /var/run
-  
-- name: push_image
-  image: plugins/docker
-  environment:
-    DOCKER_USERNAME:
-      from_secret: registry_username
-    DOCKER_PASSWORD:
-      from_secret: registry_password
-  commands:
-  - simple=$(echo $CI_COMMIT_BRANCH | grep '/') ;
-    p1=$(echo $CI_COMMIT_BRANCH | cut -d '/' -f1 -s) &&
-    p2=$(echo $CI_COMMIT_BRANCH | cut -d '/' -f2 -s) &&
-    tag=${simple:=$p1-$p2} &&
-    echo $DOCKER_PASSWORD | docker login git.pbiernat.dev -u $DOCKER_USERNAME --password-stdin &&
-    docker push git.pbiernat.dev/golang/vegvisir:$tag
-  volumes:
-  - name: docker-sock
-    path: /var/run
-
-services:
-- name: docker
-  image: docker:dind
-  privileged: true
-  volumes:
-  - name: gopath
-    path: /go
-  
-- name: build_image
-  image: plugins/docker
-  commands:
+  - ./test.sh
   - branch=$(echo $CI_COMMIT_BRANCH | grep -v '/') || echo $CI_COMMIT_BRANCH
   - p1=$(echo $CI_COMMIT_BRANCH | cut -d '/' -f1 -s)
   - p2=$(echo $CI_COMMIT_BRANCH | cut -d '/' -f2 -s)
   - tag=${branch:-$p1-$p2}
-  - docker build -t git.pbiernat.dev/golang/vegvisir:$tag -f Dockerfile.build .
+  - echo $tag
+  # - docker build -t git.pbiernat.dev/golang/vegvisir:$tag -f Dockerfile.build .
   volumes:
   - name: docker-sock
     path: /var/run
@@ -91,16 +51,17 @@ services:
     DOCKER_PASSWORD:
       from_secret: registry_password
   commands:
-  - simple=$(echo $CI_COMMIT_BRANCH | grep '/') || echo $CI_COMMIT_BRANCH
+  - branch=$(echo $CI_COMMIT_BRANCH | grep -v '/') || echo $CI_COMMIT_BRANCH
   - p1=$(echo $CI_COMMIT_BRANCH | cut -d '/' -f1 -s)
   - p2=$(echo $CI_COMMIT_BRANCH | cut -d '/' -f2 -s)
-  - tag=${simple:=$p1-$p2}
+  - tag=${branch:=$p1-$p2}
+  - echo $tag
   - echo $DOCKER_PASSWORD | docker login git.pbiernat.dev -u $DOCKER_USERNAME --password-stdin &&
   - docker push git.pbiernat.dev/golang/vegvisir:$tag
   volumes:
   - name: docker-sock
     path: /var/run
-
+  
 services:
 - name: docker
   image: docker:dind

test.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+set -e
+set -x
+
+# BRANCH="dev/ci-docker-builder"
+BRANCH=$CI_COMMIT_BRANCH
+
+simple=$(echo $BRANCH | grep -v '/') || echo $BRANCH
+p1=$(echo $BRANCH | cut -d '/' -f1 -s)
+p2=$(echo $BRANCH | cut -d '/' -f2 -s)
+tag=${simple:-$p1-$p2}
+echo $tag
+
+# p1=$(echo "develop" | grep -s '/') && echo "1: $p1"
+# p2=$(echo "develop/fix" | grep -s '/') && echo "2: $p2"
+# p3=$(echo "develop" | grep -s -v '/') && echo "3: $p3"
+# p4=$(echo "develop/fix" | grep -s -v '/') && echo "4: $p4"
+
+# echo $p1 $p2 $p3 $p4
+# echo "DONE"
+
+
+#simple=$(echo $BRANCH | grep -v '/') ;
+#p1=$(echo $BRANCH | cut -d '/' -f1 -s) ;
+#p2=$(echo $BRANCH | cut -d '/' -f2 -s) ;
+#tag=${simple:=$p1-$p2} &&
+
+#echo "TAG:" $tag