From 8027454cb5366f703fc429f9e546e938a65ff587 Mon Sep 17 00:00:00 2001 From: Kyle Manna Date: Fri, 2 Sep 2016 21:57:23 -0700 Subject: [PATCH] google-auth: Pull from community repository again * Pull from upstream community repository instead of building inline. --- Dockerfile | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2e63fdc..9f341ca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,22 +5,12 @@ FROM alpine:3.4 MAINTAINER Kyle Manna -RUN echo "http://dl-4.alpinelinux.org/alpine/edge/testing/" >> /etc/apk/repositories && \ - apk add --update openvpn iptables bash easy-rsa openvpn-auth-pam pamtester && \ +RUN echo "http://dl-4.alpinelinux.org/alpine/edge/community/" >> /etc/apk/repositories && \ + echo "http://dl-4.alpinelinux.org/alpine/edge/testing/" >> /etc/apk/repositories && \ + apk add --update openvpn iptables bash easy-rsa openvpn-auth-pam google-authenticator pamtester && \ ln -s /usr/share/easy-rsa/easyrsa /usr/local/bin && \ rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/* -COPY alpine /tmp/local -RUN adduser -D -G abuild abuild && \ - chown -R abuild:abuild /tmp/local && \ - apk add --update alpine-sdk && \ - su -s /bin/bash -c 'cd /tmp/local/google-authenticator && abuild-keygen -a && abuild -Fr' abuild && \ - cp /home/abuild/.abuild/abuild*.pub /etc/apk/keys/ && \ - apk add /home/abuild/packages/local/x86_64/google-authenticator-20160207-r1.apk && \ - apk del --purge --rdepends alpine-sdk && rm -rf /home/abuild && \ - rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/* - - # Needed by scripts ENV OPENVPN /etc/openvpn ENV EASYRSA /usr/share/easy-rsa