From 2adb9aaea36f3637bb180632d50fd6eab6180ea0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lauri=20V=C3=B5sandi?= <lauri@pinecrypt.com>
Date: Thu, 3 Jun 2021 20:06:29 +0300
Subject: [PATCH] Remove OpenVPN and StrongSwan from this image

---
 Dockerfile             |  4 +---
 config/strongswan.conf | 45 ------------------------------------------
 2 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 config/strongswan.conf

diff --git a/Dockerfile b/Dockerfile
index 94a8d32..4cd3e88 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,15 +10,13 @@ RUN echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup \
     bash build-essential python3-dev cython3 libffi-dev libssl-dev \
     libkrb5-dev ldap-utils libsasl2-modules-gssapi-mit libsasl2-dev libldap2-dev \
     python python3-pip python3-cffi iptables ipset \
-    strongswan libstrongswan-extra-plugins libcharon-extra-plugins \
-    openvpn  libncurses5-dev gawk wget unzip git rsync \
+    libncurses5-dev gawk wget unzip git rsync \
  && apt-get clean \
  && rm /etc/dpkg/dpkg.cfg.d/docker-apt-speedup
 
 WORKDIR /src
 COPY requirements.txt /src/
 RUN pip3 install --no-cache-dir -r requirements.txt
-COPY config/strongswan.conf /etc/strongswan.conf
 COPY pinecrypt/. /src/pinecrypt/
 COPY MANIFEST.in setup.py README.md /src/
 COPY misc/. /src/misc/
diff --git a/config/strongswan.conf b/config/strongswan.conf
deleted file mode 100644
index 542b9f8..0000000
--- a/config/strongswan.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-charon {
-  load_modular = yes
-  plugins {
-    include /etc/strongswan.d/charon/ccm.conf
-    include /etc/strongswan.d/charon/nonce.conf
-    include /etc/strongswan.d/charon/updown.conf
-    include /etc/strongswan.d/charon/pkcs11.conf
-    include /etc/strongswan.d/charon/connmark.conf
-    include /etc/strongswan.d/charon/pkcs1.conf
-    include /etc/strongswan.d/charon/constraints.conf
-    include /etc/strongswan.d/charon/revocation.conf
-    include /etc/strongswan.d/charon/openssl.conf
-    include /etc/strongswan.d/charon/aes.conf
-    include /etc/strongswan.d/charon/resolve.conf
-    include /etc/strongswan.d/charon/curve25519.conf
-    include /etc/strongswan.d/charon/gcm.conf
-    include /etc/strongswan.d/charon/random.conf
-    include /etc/strongswan.d/charon/pkcs7.conf
-    include /etc/strongswan.d/charon/af-alg.conf
-    include /etc/strongswan.d/charon/x509.conf
-    include /etc/strongswan.d/charon/rdrand.conf
-    include /etc/strongswan.d/charon/hmac.conf
-    include /etc/strongswan.d/charon/gmp.conf
-    include /etc/strongswan.d/charon/pubkey.conf
-    include /etc/strongswan.d/charon/ctr.conf
-    include /etc/strongswan.d/charon/certexpire.conf
-    include /etc/strongswan.d/charon/socket-default.conf
-    include /etc/strongswan.d/charon/lookip.conf
-    include /etc/strongswan.d/charon/mgf1.conf
-    include /etc/strongswan.d/charon/unity.conf
-    include /etc/strongswan.d/charon/sha2.conf
-    include /etc/strongswan.d/charon/stroke.conf
-    include /etc/strongswan.d/charon/aesni.conf
-    include /etc/strongswan.d/charon/agent.conf
-    include /etc/strongswan.d/charon/kernel-libipsec.conf
-    include /etc/strongswan.d/charon/curl.conf
-    include /etc/strongswan.d/charon/pkcs8.conf
-    include /etc/strongswan.d/charon/cmac.conf
-    include /etc/strongswan.d/charon/attr.conf
-    include /etc/strongswan.d/charon/error-notify.conf
-    include /etc/strongswan.d/charon/pem.conf
-    include /etc/strongswan.d/charon/pkcs12.conf
-    include /etc/strongswan.d/charon/kernel-netlink.conf
-  }
-}