chore(docker): attempt to fix docker env variables and unify exports (#…

…41)

chore(docker): attempt to fix docker env variables and unify exports

docker/Dockerfile

@@ -1,17 +1,17 @@
 FROM golang:1.11-alpine AS build
-ARG VERSION=0.0.0
-ARG GIT_HASH=c0ff33
+ARG SOURCE_BRANCH
+ARG SOURCE_COMMIT
 WORKDIR /go/src/github.com/target/flottbot/
 RUN apk add --no-cache git
 RUN go get -u github.com/golang/dep/cmd/dep
 COPY / .
 RUN dep ensure
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
-    go build -ldflags "-X github.com/target/flottbot/version.Version=${VERSION} -X github.com/target/flottbot/version.GitHash=${GIT_HASH}" \
+    go build -ldflags "-X github.com/target/flottbot/version.Version=${SOURCE_BRANCH} -X github.com/target/flottbot/version.GitHash=${SOURCE_COMMIT}" \
     -o flottbot .
 
 FROM alpine:3.8
 RUN apk --no-cache add ca-certificates
 RUN mkdir config
 COPY --from=build /go/src/github.com/target/flottbot/flottbot .
-EXPOSE 8080 80
+EXPOSE 8080 3000 4000

docker/Dockerfile.golang

@@ -1,19 +1,17 @@
 FROM golang:1.11-alpine AS build
-ARG VERSION=0.0.0
-ARG GIT_HASH=c0ff33
+ARG SOURCE_BRANCH
+ARG SOURCE_COMMIT
 WORKDIR /go/src/github.com/target/flottbot/
 RUN apk add --no-cache git
 RUN go get -u github.com/golang/dep/cmd/dep
 COPY / .
 RUN dep ensure
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
-    go build -ldflags "-X github.com/target/flottbot/version.Version=${VERSION} -X github.com/target/flottbot/version.GitHash=${GIT_HASH}" \
+    go build -ldflags "-X github.com/target/flottbot/version.Version=${SOURCE_BRANCH} -X github.com/target/flottbot/version.GitHash=${SOURCE_COMMIT}" \
     -o flottbot .
 
 FROM golang:1.11-alpine
 RUN apk add --no-cache git
 RUN mkdir config
 COPY --from=build /go/src/github.com/target/flottbot/flottbot .
-EXPOSE 8080 80
-EXPOSE 3000 3000
-EXPOSE 4000 4000
+EXPOSE 8080 3000 4000

docker/Dockerfile.ruby

@@ -1,17 +1,17 @@
 FROM golang:1.11-alpine AS build
-ARG VERSION=0.0.0
-ARG GIT_HASH=c0ff33
+ARG SOURCE_BRANCH
+ARG SOURCE_COMMIT
 WORKDIR /go/src/github.com/target/flottbot/
 RUN apk add --no-cache git
 RUN go get -u github.com/golang/dep/cmd/dep
 COPY / .
 RUN dep ensure
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 \
-    go build -ldflags "-X github.com/target/flottbot/version.Version=${VERSION} -X github.com/target/flottbot/version.GitHash=${GIT_HASH}" \
+    go build -ldflags "-X github.com/target/flottbot/version.Version=${SOURCE_BRANCH} -X github.com/target/flottbot/version.GitHash=${SOURCE_COMMIT}" \
     -o flottbot .
 
 FROM ruby:2.5-alpine
 RUN apk add --no-cache ruby-dev build-base
 RUN mkdir config
 COPY --from=build /go/src/github.com/target/flottbot/flottbot .
-EXPOSE 8080 80
+EXPOSE 8080 3000 4000

docker/hooks/build

@@ -0,0 +1,8 @@
+#!/bin/bash -xe
+DOCKER_PATH=$(echo $DOCKERFILE_PATH | sed -e 's/.*\///g')
+
+docker build \
+    --build-arg "SOURCE_BRANCH=$SOURCE_BRANCH" \
+    --build-arg "SOURCE_COMMIT=$SOURCE_COMMIT" \
+    -f $DOCKER_PATH \
+    -t $IMAGE_NAME ../