Skip to content

Commit

Permalink
Update and cleanup Dockerfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
gruebel committed Oct 15, 2018
1 parent d2ed775 commit ad84aec
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down Expand Up @@ -35,7 +34,7 @@ RUN make lint && make test && make build \
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.33

WORKDIR /out

Expand Down
8 changes: 3 additions & 5 deletions build/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -21,8 +21,6 @@ WORKDIR $EKSCTL_BUILD

RUN dep ensure

WORKDIR $EKSCTL_BUILD

RUN ./install.sh

WORKDIR $EKSCTL_BUILD/vendor/github.com/goreleaser/goreleaser
Expand Down

0 comments on commit ad84aec

Please sign in to comment.