Merge pull request #38 from dgoodwin/art-dockerfile-updates

Prep Dockerfile for building with ART tooling.
openshift · Sep 10, 2018 · 7957e91 · 7957e91
2 parents 57db36f + bc6e185
commit 7957e91
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/cmd/machine-controller/Dockerfile → Dockerfile b/cmd/machine-controller/Dockerfile → Dockerfile
@@ -14,13 +14,17 @@
 
 # Reproducible builder image
 FROM openshift/origin-release:golang-1.10 as builder
+
+# Workaround a bug in imagebuilder (some versions) where this dir will not be auto-created.
+RUN mkdir -p /go/src/sigs.k8s.io/cluster-api-provider-aws
 WORKDIR /go/src/sigs.k8s.io/cluster-api-provider-aws
+
 # This expects that the context passed to the docker build command is
 # the cluster-api-provider-aws directory.
 # e.g. docker build -t <tag> -f <this_Dockerfile> <path_to_cluster-api-aws>
-COPY . . 
+COPY . .
 
-RUN CGO_ENABLED=0 GOOS=linux go install -a -ldflags '-extldflags "-static"' sigs.k8s.io/cluster-api-provider-aws/cmd/machine-controller
+RUN GOPATH="/go" CGO_ENABLED=0 GOOS=linux go install -a -ldflags '-extldflags "-static"' sigs.k8s.io/cluster-api-provider-aws/cmd/machine-controller
 
 # Final container
 FROM openshift/origin-base

diff --git a/cmd/machine-controller/Makefile b/cmd/machine-controller/Makefile
@@ -21,7 +21,7 @@ NAME = aws-machine-controller
 TAG = 0.0.1
 
 image:
-	imagebuilder -t "$(PREFIX)/$(NAME):$(TAG)" -f ./Dockerfile ../..
+	imagebuilder -t "$(PREFIX)/$(NAME):$(TAG)" -f ../../Dockerfile ../..
 
 push: image
 	docker push "$(PREFIX)/$(NAME):$(TAG)"
@@ -32,7 +32,7 @@ fix_gcs_permissions:
 	gsutil -m acl ch -r -u AllUsers:READ gs://artifacts.$(GCR_BUCKET).appspot.com
 
 dev_image:
-	docker build -t "$(DEV_PREFIX)/$(NAME):$(TAG)-dev" -f ./Dockerfile ../..
+	docker build -t "$(DEV_PREFIX)/$(NAME):$(TAG)-dev" -f ../../Dockerfile ../..
 
 dev_push: dev_image
 	docker push "$(DEV_PREFIX)/$(NAME):$(TAG)-dev"