Skip to content

Commit 7f3e056

Browse files
committed
Docker: extends official docker image
1 parent f920b51 commit 7f3e056

File tree

1 file changed

+5
-21
lines changed

1 file changed

+5
-21
lines changed

Dockerfile

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,13 @@
1-
FROM dockette/alpine:edge
1+
FROM docker:20.10-cli
22

3-
# Base on https://raw.githubusercontent.com/wernight/docker-compose/master/Dockerfile
4-
5-
ENV GLIBC_VERSION=2.28-r0
6-
ENV DOCKER_COMPOSE_VERSION=v2.16.0
73
ENV DOCKER_BUILDKIT=1
84

9-
RUN set -x && \
10-
echo '@community http://nl.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories && \
11-
apk update && \
5+
RUN apk update && \
126
apk upgrade && \
13-
apk add --no-cache docker@community make git && \
14-
apk add --no-cache -t .deps ca-certificates wget curl && \
15-
wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
16-
wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk && \
17-
wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-bin-${GLIBC_VERSION}.apk && \
18-
apk add glibc-${GLIBC_VERSION}.apk glibc-bin-${GLIBC_VERSION}.apk && \
19-
rm glibc-${GLIBC_VERSION}.apk glibc-bin-${GLIBC_VERSION}.apk && \
20-
# Install docker-compose
21-
curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-Linux-x86_64 > /usr/local/bin/docker-compose && \
22-
chmod a+rx /usr/local/bin/docker-compose && \
7+
# Install extra deps
8+
apk add --no-cache make git curl wget && \
239
# Basic check it works
2410
docker -v && \
25-
docker-compose -v && \
26-
# Clean-up
27-
apk del .deps
11+
docker-compose -v
2812

2913
CMD ["/bin/sh"]

0 commit comments

Comments
 (0)