Merge pull request #43 from theohbrothers/fix/do-not-include-etc-open…

…vpn-x.conf-and-etc-openvpn-firewall.sh-in-docker-images Fix: Do not include `/etc/openvpn/*.conf` and `/etc/openvpn/firewall.sh` in docker images
theohbrothers · Dec 23, 2022 · d4dec02 · d4dec02
2 parents 2b5b9bf + a01b940
commit d4dec02
Show file tree

Hide file tree

Showing 13 changed files with 1 addition and 37 deletions.
diff --git a/generate/templates/Dockerfile.ps1 b/generate/templates/Dockerfile.ps1
@@ -6,9 +6,6 @@ RUN apk add --no-cache $( $VARIANT['_metadata']['package'] )=$( $VARIANT['_metad
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
 
-COPY openvpn /etc/openvpn
-RUN chown -R root:root /etc/openvpn && chmod 750 /etc/openvpn && chmod 750 /etc/openvpn/*.sh
-
 ENTRYPOINT ["/docker-entrypoint.sh"]
 
 "@
diff --git a/variants/v2.3.18-alpine-3.3/Dockerfile b/variants/v2.3.18-alpine-3.3/Dockerfile
@@ -5,7 +5,4 @@ RUN apk add --no-cache openvpn=2.3.18-r0 iptables
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
 
-COPY openvpn /etc/openvpn
-RUN chown -R root:root /etc/openvpn && chmod 750 /etc/openvpn && chmod 750 /etc/openvpn/*.sh
-
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/variants/v2.3.18-alpine-3.4/Dockerfile b/variants/v2.3.18-alpine-3.4/Dockerfile
@@ -5,7 +5,4 @@ RUN apk add --no-cache openvpn=2.3.18-r0 iptables
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
 
-COPY openvpn /etc/openvpn
-RUN chown -R root:root /etc/openvpn && chmod 750 /etc/openvpn && chmod 750 /etc/openvpn/*.sh
-
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/variants/v2.3.18-alpine-3.5/Dockerfile b/variants/v2.3.18-alpine-3.5/Dockerfile
@@ -5,7 +5,4 @@ RUN apk add --no-cache openvpn=2.3.18-r0 iptables
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
 
-COPY openvpn /etc/openvpn
-RUN chown -R root:root /etc/openvpn && chmod 750 /etc/openvpn && chmod 750 /etc/openvpn/*.sh
-
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/variants/v2.4.11-alpine-3.10/Dockerfile b/variants/v2.4.11-alpine-3.10/Dockerfile
@@ -5,7 +5,4 @@ RUN apk add --no-cache openvpn=2.4.11-r0 iptables
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
 
-COPY openvpn /etc/openvpn
-RUN chown -R root:root /etc/openvpn && chmod 750 /etc/openvpn && chmod 750 /etc/openvpn/*.sh
-
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/variants/v2.4.11-alpine-3.11/Dockerfile b/variants/v2.4.11-alpine-3.11/Dockerfile
@@ -5,7 +5,4 @@ RUN apk add --no-cache openvpn=2.4.11-r0 iptables
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
 
-COPY openvpn /etc/openvpn
-RUN chown -R root:root /etc/openvpn && chmod 750 /etc/openvpn && chmod 750 /etc/openvpn/*.sh
-
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/variants/v2.4.12-alpine-3.12/Dockerfile b/variants/v2.4.12-alpine-3.12/Dockerfile
@@ -5,7 +5,4 @@ RUN apk add --no-cache openvpn=2.4.12-r0 iptables
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
 
-COPY openvpn /etc/openvpn
-RUN chown -R root:root /etc/openvpn && chmod 750 /etc/openvpn && chmod 750 /etc/openvpn/*.sh
-
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/variants/v2.4.4-alpine-3.6/Dockerfile b/variants/v2.4.4-alpine-3.6/Dockerfile
@@ -5,7 +5,4 @@ RUN apk add --no-cache openvpn=2.4.4-r0 iptables
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
 
-COPY openvpn /etc/openvpn
-RUN chown -R root:root /etc/openvpn && chmod 750 /etc/openvpn && chmod 750 /etc/openvpn/*.sh
-
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/variants/v2.4.4-alpine-3.7/Dockerfile b/variants/v2.4.4-alpine-3.7/Dockerfile
@@ -5,7 +5,4 @@ RUN apk add --no-cache openvpn=2.4.4-r1 iptables
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
 
-COPY openvpn /etc/openvpn
-RUN chown -R root:root /etc/openvpn && chmod 750 /etc/openvpn && chmod 750 /etc/openvpn/*.sh
-
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/variants/v2.4.6-alpine-3.8/Dockerfile b/variants/v2.4.6-alpine-3.8/Dockerfile
@@ -5,7 +5,4 @@ RUN apk add --no-cache openvpn=2.4.6-r3 iptables
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
 
-COPY openvpn /etc/openvpn
-RUN chown -R root:root /etc/openvpn && chmod 750 /etc/openvpn && chmod 750 /etc/openvpn/*.sh
-
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/variants/v2.4.6-alpine-3.9/Dockerfile b/variants/v2.4.6-alpine-3.9/Dockerfile
@@ -5,7 +5,4 @@ RUN apk add --no-cache openvpn=2.4.6-r4 iptables
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
 
-COPY openvpn /etc/openvpn
-RUN chown -R root:root /etc/openvpn && chmod 750 /etc/openvpn && chmod 750 /etc/openvpn/*.sh
-
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/variants/v2.5.6-alpine-3.13/Dockerfile b/variants/v2.5.6-alpine-3.13/Dockerfile
@@ -5,7 +5,4 @@ RUN apk add --no-cache openvpn=2.5.6-r0 iptables
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 RUN chmod +x /docker-entrypoint.sh
 
-COPY openvpn /etc/openvpn
-RUN chown -R root:root /etc/openvpn && chmod 750 /etc/openvpn && chmod 750 /etc/openvpn/*.sh
-
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/variants/v2.5.6-alpine-3.13/docker-compose.yml b/variants/v2.5.6-alpine-3.13/docker-compose.yml
@@ -37,4 +37,4 @@ services:
       # - net.ipv6.conf.all.disable_ipv6=0
       # - net.ipv6.conf.default.forwarding=1
       # - net.ipv6.conf.all.forwarding=1
-    restart: unless-stopped
+    restart: unless-stopped