[fix] CI/CD fixes

.drone.yml

@@ -3,8 +3,8 @@ type: docker
 name: default
 
 steps:
-- name: static_check
-  image: golang:1.18
+- name: go_static_check
+  image: golang:latest
   commands:
   - go install honnef.co/go/tools/cmd/staticcheck@latest
   - staticcheck ./pkg/...
@@ -12,8 +12,8 @@ steps:
   - name: gopath
     path: /go
 
-- name: lint
-  image: golang:1.18
+- name: go_lint
+  image: golang:latest
   commands:
   - go install golang.org/x/lint/golint@latest
   - golint -set_exit_status ./pkg/...
@@ -21,8 +21,8 @@ steps:
   - name: gopath
     path: /go
 
-- name: vet
-  image: golang:1.18
+- name: go_vet
+  image: golang:latest
   commands:
   - go vet ./pkg/...
   volumes:
@@ -34,6 +34,10 @@ steps:
   commands:
   - sleep 5
   - ./deploy/build_image.sh
+  depends_on:
+  - go_static_check
+  - go_lint
+  - go_vet
   volumes:
   - name: docker-sock
     path: /var/run
@@ -47,6 +51,8 @@ steps:
       from_secret: registry_password
   commands:
   - ./deploy/publish_image.sh
+  depends_on:
+  - build_image
   volumes:
   - name: docker-sock
     path: /var/run

deploy/build_image.sh

@@ -1,14 +1,10 @@
 #!/bin/sh
-set -e
-set -x
+set -evx
 
-# BRANCH="dev/ci-docker-builder"
-# BRANCH="develop"
-# BRANCH=$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) &&
+branch=${DRONE_TAG:=$CI_COMMIT_BRANCH}
+branch=$(echo $branch | grep -v /) || echo $branch ;
+p1=$(echo $branch | cut -d / -f1 -s) &&
+p2=$(echo $branch | cut -d / -f2 -s) &&
 tag=${branch:=$p1-$p2} && 
 echo "Building" $tag
 

deploy/publish_image.sh

@@ -1,16 +1,11 @@
 #!/bin/sh
-set -e
-set -x
+set -evx
 
-# BRANCH="dev/ci-docker-builder"
-# BRANCH="develop"
-# BRANCH=$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=${branch:=$p1-$p2} &&
+branch=${DRONE_TAG:=$CI_COMMIT_BRANCH}
+branch=$(echo $branch | grep -v /) || echo $branch ;
+p1=$(echo $branch | cut -d / -f1 -s) &&
+p2=$(echo $branch | cut -d / -f2 -s) &&
+tag=${branch:=$p1-$p2} && 
 echo "Publishing" $tag
 
 echo $DOCKER_PASSWORD | docker login git.pbiernat.dev -u $DOCKER_USERNAME --password-stdin &&