diff --git a/.drone.yml b/.drone.yml index 58d316e..90a453d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -32,12 +32,13 @@ steps: - name: build_image image: plugins/docker commands: + - env + - 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=${branch:=$p1-$p2} && + echo $tag - ./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} - # - echo $tag # - docker build -t git.pbiernat.dev/golang/vegvisir:$tag -f Dockerfile.build . volumes: - name: docker-sock @@ -56,8 +57,8 @@ steps: - p2=$(echo $CI_COMMIT_BRANCH | cut -d '/' -f2 -s) - 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 + # - 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 diff --git a/test.sh b/test.sh index afe66e2..cdd4dc3 100755 --- a/test.sh +++ b/test.sh @@ -1,15 +1,16 @@ #!/bin/sh -set -e -set -x +# set -e +# set -x # BRANCH="dev/ci-docker-builder" -BRANCH="develop" +# BRANCH="develop" +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 +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 "tag:" $tag # p1=$(echo "develop" | grep -s '/') && echo "1: $p1" # p2=$(echo "develop/fix" | grep -s '/') && echo "2: $p2"