Update and cleanup Dockerfiles

eksctl-io · Oct 16, 2018 · 1b8eb39 · 1b8eb39
1 parent d2ed775
commit 1b8eb39
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,13 +1,12 @@
 ARG EKSCTL_BUILD_IMAGE
 FROM $EKSCTL_BUILD_IMAGE AS build
 
-RUN apk add --update \
+RUN apk add --no-cache \
       py-pip \
       python \
       python-dev \
       && true
 
-RUN mkdir /out
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 RUN apk add --no-cache --initdb --root /out \
     alpine-baselayout \
@@ -29,13 +28,15 @@ ARG COVERALLS_TOKEN
 ENV COVERALLS_TOKEN $COVERALLS_TOKEN
 
 WORKDIR $EKSCTL
-RUN make lint && make test && make build \
+RUN make lint
+RUN make test
+RUN make build \
     && cp ./eksctl /out/usr/local/bin/eksctl
 
 RUN go build ./vendor/github.com/kubernetes-sigs/aws-iam-authenticator/cmd/aws-iam-authenticator \
     && cp ./aws-iam-authenticator /out/usr/local/bin/aws-iam-authenticator
 
-RUN pip install --root=/out aws-mfa==0.0.12 awscli==1.15.40
+RUN pip install --root=/out aws-mfa==0.0.12 awscli==1.16.34
 
 WORKDIR /out
 

diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@ build: ## Build eksctl
 test: generate ## Run unit tests
 	@git diff --exit-code pkg/nodebootstrap/assets.go > /dev/null || (git --no-pager diff; exit 1)
 	@git diff --exit-code ./pkg/eks/mocks > /dev/null || (git --no-pager diff; exit 1)
-	@go test -v -covermode=count -coverprofile=coverage.out ./pkg/... ./cmd/...
+	@CGO_ENABLED=0 go test -v -covermode=count -coverprofile=coverage.out ./pkg/... ./cmd/...
 	@test -z $(COVERALLS_TOKEN) || $(GOPATH)/bin/goveralls -coverprofile=coverage.out -service=circle-ci
 
 LINTER ?= gometalinter ./...

diff --git a/build/Dockerfile b/build/Dockerfile
@@ -1,13 +1,13 @@
-FROM golang:1.10.2-alpine3.7
+FROM golang:1.11-alpine3.8
 
-RUN apk add --update \
+RUN apk add --no-cache \
       curl \
       git \
       make \
       gcc \
       && true
 
-ENV DEP_VERSION v0.4.1
+ENV DEP_VERSION v0.5.0
 
 # Install dep to avoid vendoring all the things
 RUN curl --silent --location "https://github.com/golang/dep/releases/download/${DEP_VERSION}/dep-linux-amd64" --output /usr/local/bin/dep \
@@ -21,8 +21,6 @@ WORKDIR $EKSCTL_BUILD
 
 RUN dep ensure
 
-WORKDIR $EKSCTL_BUILD
-
 RUN ./install.sh
 
 WORKDIR $EKSCTL_BUILD/vendor/github.com/goreleaser/goreleaser