Merge pull request #1407 from timstclair/dockerfile
Update Dockerfile and dependencies
This commit is contained in:
commit
f7a30e0b43
@ -1,13 +1,14 @@
|
||||
FROM alpine:3.2
|
||||
MAINTAINER dengnan@google.com vmarmol@google.com vishnuk@google.com jimmidyson@gmail.com
|
||||
FROM alpine:3.4
|
||||
MAINTAINER dengnan@google.com vmarmol@google.com vishnuk@google.com jimmidyson@gmail.com stclair@google.com
|
||||
|
||||
ENV GLIBC_VERSION "2.23-r1"
|
||||
ENV GLIBC_VERSION "2.23-r3"
|
||||
|
||||
RUN apk add --update ca-certificates device-mapper && \
|
||||
wget https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk && \
|
||||
RUN apk --no-cache add ca-certificates wget device-mapper && \
|
||||
apk --no-cache add zfs --repository http://dl-3.alpinelinux.org/alpine/edge/main/ && \
|
||||
wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://raw.githubusercontent.com/sgerrand/alpine-pkg-glibc/master/sgerrand.rsa.pub && \
|
||||
wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk && \
|
||||
wget https://github.com/andyshinn/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-bin-${GLIBC_VERSION}.apk && \
|
||||
apk add --allow-untrusted glibc-${GLIBC_VERSION}.apk glibc-bin-${GLIBC_VERSION}.apk && \
|
||||
apk add zfs-utils --update-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing/ --allow-untrusted && \
|
||||
apk add glibc-${GLIBC_VERSION}.apk glibc-bin-${GLIBC_VERSION}.apk && \
|
||||
/usr/glibc-compat/sbin/ldconfig /lib /usr/glibc-compat/lib && \
|
||||
echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
Loading…
Reference in New Issue
Block a user