From 3e25078039da4af0094df817ed714cf266f5517b Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Wed, 28 Nov 2018 13:36:13 +0100
Subject: [PATCH] Change order an add a couple more symbolic links
---
Dockerfile | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index c9d3b77..98699db 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,11 @@ LABEL com.example.vendor="PARAGON Executive Service GmbH" \
ARG compose_version=1.21.2
RUN apk update && \
- apk add --no-cache curl openssl openssh ca-certificates wget make && \
+ apk add --no-cache curl openssl openssh ca-certificates wget make \
+ bash python nodejs npm git unzip \
+ php7 php7-phar php7-json php7-dom php7-gd php7-mbstring php7-openssl \
+ php7-pdo php7-curl php7-xml php7-zip php7-session php7-ctype \
+ php7-tokenizer php7-simplexml php7-xmlwriter && \
\
wget -q https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -O /etc/apk/keys/sgerrand.rsa.pub && \
wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.23-r3/glibc-2.23-r3.apk && \
@@ -16,11 +20,9 @@ RUN apk update && \
rm glibc-2.23-r3.apk && \
ln -s /lib/libz.so.1 /usr/glibc-compat/lib/ && \
ln -s /lib/libc.musl-x86_64.so.1 /usr/glibc-compat/lib && \
+ ln -s /usr/lib/libgcc_s.so.1 /lib/libgcc_s.so.1 && \
+ ln -s /lib/libgcc_s.so.1 /usr/glibc-compat/lib/ && \
\
- apk add --no-cache bash python nodejs npm git unzip \
- php7 php7-phar php7-json php7-dom php7-gd php7-mbstring php7-openssl \
- php7-pdo php7-curl php7-xml php7-zip php7-session php7-ctype \
- php7-tokenizer php7-simplexml php7-xmlwriter && \
ln -s /usr/bin/php7 /usr/local/bin/php &&\
\
wget -q https://github.com/docker/compose/releases/download/${compose_version}/docker-compose-`uname -s`-`uname -m` -O /usr/local/bin/docker-compose && \
--
GitLab