Skip to content

Commit 1e508d9

Browse files
committed
Update dockerfile
1 parent 29dc473 commit 1e508d9

File tree

1 file changed

+8
-42
lines changed

1 file changed

+8
-42
lines changed

1.0/Dockerfile

Lines changed: 8 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,19 @@
1-
FROM docker:latest
2-
3-
4-
# Install tzdata and change to Europe/Paris
5-
RUN set -x && \
6-
apk --update add tzdata && \
7-
ln -sf /usr/share/zoneinfo/Europe/Paris /etc/localtime && \
8-
date && \
9-
rm -rf /var/cache/apk/*
10-
1+
FROM tmaier/docker-compose
112

123
# Install tools...
134
RUN set -x && \
14-
apk --update add \
5+
apk --no-cache add \
156
ca-certificates \
16-
curl \
17-
make \
18-
nano \
19-
gcc \
20-
wget \
7+
git \
218
openssh \
229
openssh-client \
23-
bash \
24-
git \
25-
&& rm -rf /var/cache/apk/*
26-
27-
28-
# Install glibc on Alpine (required by docker-compose) from
29-
# https://github.com/sgerrand/alpine-pkg-glibc
30-
# See also https://github.com/gliderlabs/docker-alpine/issues/11
31-
RUN set -x && \
32-
GLIBC_VERSION='2.23-r3' && \
33-
curl -Lo /etc/apk/keys/sgerrand.rsa.pub https://raw.githubusercontent.com/sgerrand/alpine-pkg-glibc/master/sgerrand.rsa.pub && \
34-
curl -Lo glibc.apk https://github.com/sgerrand/alpine-pkg-glibc/releases/download/$GLIBC_VERSION/glibc-$GLIBC_VERSION.apk && \
35-
curl -Lo glibc-bin.apk https://github.com/sgerrand/alpine-pkg-glibc/releases/download/$GLIBC_VERSION/glibc-bin-$GLIBC_VERSION.apk && \
36-
apk update && \
37-
apk add glibc.apk glibc-bin.apk && \
38-
rm -rf /var/cache/apk/* glibc.apk glibkc-bin.apk
39-
40-
# Install docker-compose
41-
# https://docs.docker.com/compose/install/
42-
RUN set -x && \
43-
DOCKER_COMPOSE_URL=https://github.com$(curl -L https://github.com/docker/compose/releases/latest | grep -Eo 'href="[^"]+docker-compose-Linux-x86_64' | sed 's/^href="//') && \
44-
curl -Lo /usr/local/bin/docker-compose $DOCKER_COMPOSE_URL && \
45-
chmod a+rx /usr/local/bin/docker-compose
10+
wget \
11+
curl \
12+
make \
13+
bash
4614

4715
# Print info to check if everything is OK
4816
RUN set -x && \
4917
( docker version || true ) && \
5018
docker-compose version && \
51-
make -v && \
52-
gcc -v && \
53-
date
19+
make -v

0 commit comments

Comments
 (0)