Skip to content

Commit

Permalink
Update dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
zhouzhuojie committed Aug 7, 2018
1 parent 29dc473 commit 1e508d9
Showing 1 changed file with 8 additions and 42 deletions.
50 changes: 8 additions & 42 deletions 1.0/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,53 +1,19 @@
FROM docker:latest


# Install tzdata and change to Europe/Paris
RUN set -x && \
apk --update add tzdata && \
ln -sf /usr/share/zoneinfo/Europe/Paris /etc/localtime && \
date && \
rm -rf /var/cache/apk/*

FROM tmaier/docker-compose

# Install tools...
RUN set -x && \
apk --update add \
apk --no-cache add \
ca-certificates \
curl \
make \
nano \
gcc \
wget \
git \
openssh \
openssh-client \
bash \
git \
&& rm -rf /var/cache/apk/*


# Install glibc on Alpine (required by docker-compose) from
# https://github.com/sgerrand/alpine-pkg-glibc
# See also https://github.com/gliderlabs/docker-alpine/issues/11
RUN set -x && \
GLIBC_VERSION='2.23-r3' && \
curl -Lo /etc/apk/keys/sgerrand.rsa.pub https://raw.githubusercontent.com/sgerrand/alpine-pkg-glibc/master/sgerrand.rsa.pub && \
curl -Lo glibc.apk https://github.com/sgerrand/alpine-pkg-glibc/releases/download/$GLIBC_VERSION/glibc-$GLIBC_VERSION.apk && \
curl -Lo glibc-bin.apk https://github.com/sgerrand/alpine-pkg-glibc/releases/download/$GLIBC_VERSION/glibc-bin-$GLIBC_VERSION.apk && \
apk update && \
apk add glibc.apk glibc-bin.apk && \
rm -rf /var/cache/apk/* glibc.apk glibkc-bin.apk

# Install docker-compose
# https://docs.docker.com/compose/install/
RUN set -x && \
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="//') && \
curl -Lo /usr/local/bin/docker-compose $DOCKER_COMPOSE_URL && \
chmod a+rx /usr/local/bin/docker-compose
wget \
curl \
make \
bash

# Print info to check if everything is OK
RUN set -x && \
( docker version || true ) && \
docker-compose version && \
make -v && \
gcc -v && \
date
make -v

0 comments on commit 1e508d9

Please sign in to comment.