Skip to content

Commit 8f53864

Browse files
authored
Merge pull request #60 from mboersma/add-missing-tools
feat(Dockerfile): base off deis/base
2 parents 6f2e464 + e74b96e commit 8f53864

1 file changed

Lines changed: 12 additions & 4 deletions

File tree

rootfs/Dockerfile

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,23 @@
1-
FROM golang:1.7.1
1+
FROM quay.io/deis/base:v0.3.4
22

3-
ENV GLIDE_VERSION=v0.12.2 \
4-
GLIDE_HOME=/root
3+
ENV GO_VERSION=1.7.1 \
4+
GLIDE_VERSION=v0.12.2 \
5+
GLIDE_HOME=/root \
6+
PATH=$PATH:/usr/local/go/bin:/go/bin \
7+
GOPATH=/go
58

6-
RUN apt-get update && apt-get install -y \
9+
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
10+
build-essential \
11+
git-core \
12+
mercurial \
13+
util-linux \
714
jq \
815
man \
916
upx \
1017
zip \
1118
--no-install-recommends \
1219
&& rm -rf /var/lib/apt/lists/* \
20+
&& curl -L https://storage.googleapis.com/golang/go$GO_VERSION.linux-amd64.tar.gz | tar -C /usr/local -xz \
1321
&& curl -sSL https://github.com/Masterminds/glide/releases/download/$GLIDE_VERSION/glide-$GLIDE_VERSION-linux-amd64.tar.gz \
1422
| tar -vxz -C /usr/local/bin --strip=1 \
1523
&& curl -L https://s3-us-west-2.amazonaws.com/get-deis/shellcheck-0.4.3-linux-amd64 -o /usr/local/bin/shellcheck \

0 commit comments

Comments
 (0)