Merge pull request #60 from lukaszbudnik/correct-docker-cloud-builds

correct docker cloud integration

Author: lukaszbudnik

Dockerfile

@@ -2,10 +2,12 @@ FROM golang:1.11.2-alpine3.8 as builder
 
 MAINTAINER Łukasz Budnik [email protected]
 
+ARG SOURCE_BRANCH
+
 # build migrator
 RUN apk add git
 RUN go get -d -v github.com/lukaszbudnik/migrator
-RUN cd /go/src/github.com/lukaszbudnik/migrator && ./setup.sh
+RUN cd /go/src/github.com/lukaszbudnik/migrator && git checkout $SOURCE_BRANCH && ./setup.sh
 RUN cd /go/src/github.com/lukaszbudnik/migrator && \
   GIT_BRANCH=$(git branch | awk -v FS=' ' '/\*/{print $NF}' | sed 's|[()]||g') && \
   GIT_COMMIT_SHA=$(git rev-list -1 HEAD) && \

TestDockerfile

@@ -2,9 +2,9 @@ FROM golang:1.11.2-alpine3.8 as builder
 
 MAINTAINER Łukasz Budnik [email protected]
 
-# use "--build-arg BRANCH=migrator-v3" to override at build time
-# docker build -f TestDockerfile --build-arg BRANCH=migrator-v3 -t migratortest:v1 .
-ARG BRANCH=master
+# use "--build-arg SOURCE_BRANCH=migrator-v3" to override at build time
+# docker build -f TestDockerfile --build-arg SOURCE_BRANCH=migrator-v3 -t migratortest:v1 .
+ARG SOURCE_BRANCH=master
 
 # git is required
 RUN apk add git
@@ -13,11 +13,10 @@ RUN apk add git
 #RUN mkdir -p /go/src/github.com/lukaszbudnik/migrator
 #COPY . /go/src/github.com/lukaszbudnik/migrator
 
-# B - install migrator from $BRANCH branch
+# B - install migrator from $SOURCE_BRANCH branch
 RUN go get -d -v github.com/lukaszbudnik/migrator
-RUN cd /go/src/github.com/lukaszbudnik/migrator && git checkout $BRANCH
+RUN cd /go/src/github.com/lukaszbudnik/migrator && git checkout $SOURCE_BRANCH && ./setup.sh
 
-RUN cd /go/src/github.com/lukaszbudnik/migrator && ./setup.sh
 RUN cd /go/src/github.com/lukaszbudnik/migrator && \
   GIT_BRANCH=$(git branch | awk -v FS=' ' '/\*/{print $NF}' | sed 's|[()]||g') && \
   GIT_COMMIT_SHA=$(git rev-list -1 HEAD) && \

hooks/build

@@ -0,0 +1,12 @@
+#!/usr/bin/env sh
+
+echo "Running custom build hook"
+
+echo "SOURCE_BRANCH: $SOURCE_BRANCH"
+echo "SOURCE_COMMIT: $SOURCE_COMMIT"
+echo "DOCKERFILE_PATH: $DOCKERFILE_PATH"
+echo "DOCKER_REPO: $DOCKER_REPO"
+echo "CACHE_TAG: $CACHE_TAG"
+echo "IMAGE_NAME: $IMAGE_NAME"
+
+docker build --build-arg SOURCE_BRANCH=$SOURCE_BRANCH -f $DOCKERFILE_PATH -t $IMAGE_NAME .