1
0
mirror of https://github.com/verdaccio/verdaccio.git synced 2024-12-24 21:15:51 +01:00

Merge remote-tracking branch 'origin/master' into 4.x

# Conflicts:
#	Dockerfile
This commit is contained in:
Juan Picado @jotadeveloper 2018-08-15 16:33:25 +02:00
commit b4c1b4a50c
No known key found for this signature in database
GPG Key ID: 18AC54485952D158

@ -5,7 +5,7 @@ ENV NODE_ENV=production \
RUN apk --no-cache add openssl ca-certificates wget && \
apk --no-cache add g++ gcc libgcc libstdc++ linux-headers make python && \
wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://raw.githubusercontent.com/sgerrand/alpine-pkg-glibc/master/sgerrand.rsa.pub && \
wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
wget -q https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.25-r0/glibc-2.25-r0.apk && \
apk add glibc-2.25-r0.apk