From 767ce4f62bdca498a5d5d995583f891932166cb9 Mon Sep 17 00:00:00 2001 From: lawtancool <26829131+lawtancool@users.noreply.github.com> Date: Wed, 25 Mar 2020 21:26:47 -0700 Subject: [PATCH] ubuntu is not available for arm32v6 --- Dockerfile.arm32v6 | 54 ---------------------------------------- multi-arch-manifest.yaml | 5 ---- 2 files changed, 59 deletions(-) delete mode 100644 Dockerfile.arm32v6 diff --git a/Dockerfile.arm32v6 b/Dockerfile.arm32v6 deleted file mode 100644 index cb63e94..0000000 --- a/Dockerfile.arm32v6 +++ /dev/null @@ -1,54 +0,0 @@ -FROM alpine AS builder - -# Download QEMU, see https://github.com/docker/hub-feedback/issues/1261 -ENV QEMU_URL https://github.com/balena-io/qemu/releases/download/v3.0.0%2Bresin/qemu-3.0.0+resin-arm.tar.gz -RUN apk add curl && curl -L ${QEMU_URL} | tar zxvf - -C . --strip-components 1 - - -# Original credit: https://github.com/jpetazzo/dockvpn - -# Smallest base image -FROM arm32v6/ubuntu:18.04 - -LABEL maintainer="lawtancool" - -# Testing: pamtester -#RUN echo "http://dl-cdn.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/* - -RUN apt-get update && apt-get install -y wget tar unzip build-essential libssl-dev iproute2 liblz4-dev liblzo2-dev libpam0g-dev libpkcs11-helper1-dev libsystemd-dev easy-rsa iptables pkg-config && \ - wget http://swupdate.openvpn.org/community/releases/openvpn-2.4.8.tar.gz && tar xvf openvpn-2.4.8.tar.gz && \ - wget https://github.com/Tunnelblick/Tunnelblick/archive/v3.8.2beta02.zip && unzip v3.8.2beta02.zip && \ - cp Tunnelblick-3.8.2beta02/third_party/sources/openvpn/openvpn-2.4.8/patches/*.diff openvpn-2.4.8 && \ - cd openvpn-2.4.8 && \ - patch -p1 < 02-tunnelblick-openvpn_xorpatch-a.diff && \ - patch -p1 < 03-tunnelblick-openvpn_xorpatch-b.diff && \ - patch -p1 < 04-tunnelblick-openvpn_xorpatch-c.diff && \ - patch -p1 < 05-tunnelblick-openvpn_xorpatch-d.diff && \ - patch -p1 < 06-tunnelblick-openvpn_xorpatch-e.diff && \ - ./configure --disable-systemd --enable-async-push --enable-iproute2 && \ - make && make install - -# Needed by scripts -ENV OPENVPN /etc/openvpn -ENV EASYRSA /usr/share/easy-rsa -ENV EASYRSA_PKI $OPENVPN/pki -ENV EASYRSA_VARS_FILE $OPENVPN/vars - -# Prevents refused client connection because of an expired CRL -ENV EASYRSA_CRL_DAYS 3650 - -VOLUME ["/etc/openvpn"] - -# Internally uses port 1194/udp, remap using `docker run -p 443:1194/tcp` -EXPOSE 1194 - -CMD ["ovpn_run"] - -ADD ./bin /usr/local/bin -RUN chmod a+x /usr/local/bin/* - -# Add support for OTP authentication using a PAM module -ADD ./otp/openvpn /etc/pam.d/ diff --git a/multi-arch-manifest.yaml b/multi-arch-manifest.yaml index b885338..e6df52f 100644 --- a/multi-arch-manifest.yaml +++ b/multi-arch-manifest.yaml @@ -4,11 +4,6 @@ manifests: platform: architecture: amd64 os: linux - - image: lawtancool/docker-openvpn-xor:arm32v6 - platform: - architecture: arm - os: linux - variant: v6 - image: lawtancool/docker-openvpn-xor:arm32v7 platform: architecture: arm