diff --git a/generate/templates/Dockerfile.ps1 b/generate/templates/Dockerfile.ps1 index 5f9e0a8..bc4c241 100644 --- a/generate/templates/Dockerfile.ps1 +++ b/generate/templates/Dockerfile.ps1 @@ -2,7 +2,7 @@ FROM $( $VARIANT['_metadata']['distro'] ):$( $VARIANT['_metadata']['distro_version'] ) RUN set -eux; \ - apk add --no-cache $( $VARIANT['_metadata']['package'] )$( if ([version]$VARIANT['_metadata']['distro_version'] -le [version]'3.6') { '>=' } else { '~=' } )$( $VARIANT['_metadata']['package_version'] ) iptables \ + apk add --no-cache $( $VARIANT['_metadata']['package'] )$( if ([version]$VARIANT['_metadata']['distro_version'] -le [version]'3.6') { '>=' } else { '~=' } )$( $VARIANT['_metadata']['package_version'] ) iptables; \ openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh diff --git a/variants/2.3.18-alpine-3.3/Dockerfile b/variants/2.3.18-alpine-3.3/Dockerfile index 5ac2f5a..0c3bf9a 100644 --- a/variants/2.3.18-alpine-3.3/Dockerfile +++ b/variants/2.3.18-alpine-3.3/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.3 RUN set -eux; \ - apk add --no-cache openvpn>=2.3.18 iptables \ + apk add --no-cache openvpn>=2.3.18 iptables; \ openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh diff --git a/variants/2.3.18-alpine-3.4/Dockerfile b/variants/2.3.18-alpine-3.4/Dockerfile index 53c60b0..5cbe13f 100644 --- a/variants/2.3.18-alpine-3.4/Dockerfile +++ b/variants/2.3.18-alpine-3.4/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.4 RUN set -eux; \ - apk add --no-cache openvpn>=2.3.18 iptables \ + apk add --no-cache openvpn>=2.3.18 iptables; \ openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh diff --git a/variants/2.3.18-alpine-3.5/Dockerfile b/variants/2.3.18-alpine-3.5/Dockerfile index 4490abb..ef6cd91 100644 --- a/variants/2.3.18-alpine-3.5/Dockerfile +++ b/variants/2.3.18-alpine-3.5/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.5 RUN set -eux; \ - apk add --no-cache openvpn>=2.3.18 iptables \ + apk add --no-cache openvpn>=2.3.18 iptables; \ openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh diff --git a/variants/2.4.11-alpine-3.10/Dockerfile b/variants/2.4.11-alpine-3.10/Dockerfile index da51498..64447a3 100644 --- a/variants/2.4.11-alpine-3.10/Dockerfile +++ b/variants/2.4.11-alpine-3.10/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.10 RUN set -eux; \ - apk add --no-cache openvpn~=2.4.11 iptables \ + apk add --no-cache openvpn~=2.4.11 iptables; \ openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh diff --git a/variants/2.4.11-alpine-3.11/Dockerfile b/variants/2.4.11-alpine-3.11/Dockerfile index 73018ea..38720c0 100644 --- a/variants/2.4.11-alpine-3.11/Dockerfile +++ b/variants/2.4.11-alpine-3.11/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.11 RUN set -eux; \ - apk add --no-cache openvpn~=2.4.11 iptables \ + apk add --no-cache openvpn~=2.4.11 iptables; \ openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh diff --git a/variants/2.4.12-alpine-3.12/Dockerfile b/variants/2.4.12-alpine-3.12/Dockerfile index 6ff43ac..8e4fedd 100644 --- a/variants/2.4.12-alpine-3.12/Dockerfile +++ b/variants/2.4.12-alpine-3.12/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.12 RUN set -eux; \ - apk add --no-cache openvpn~=2.4.12 iptables \ + apk add --no-cache openvpn~=2.4.12 iptables; \ openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh diff --git a/variants/2.4.4-alpine-3.6/Dockerfile b/variants/2.4.4-alpine-3.6/Dockerfile index 1b296b4..4f63bf3 100644 --- a/variants/2.4.4-alpine-3.6/Dockerfile +++ b/variants/2.4.4-alpine-3.6/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.6 RUN set -eux; \ - apk add --no-cache openvpn>=2.4.4 iptables \ + apk add --no-cache openvpn>=2.4.4 iptables; \ openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh diff --git a/variants/2.4.4-alpine-3.7/Dockerfile b/variants/2.4.4-alpine-3.7/Dockerfile index 5a96c3b..a408363 100644 --- a/variants/2.4.4-alpine-3.7/Dockerfile +++ b/variants/2.4.4-alpine-3.7/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.7 RUN set -eux; \ - apk add --no-cache openvpn~=2.4.4 iptables \ + apk add --no-cache openvpn~=2.4.4 iptables; \ openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh diff --git a/variants/2.4.6-alpine-3.8/Dockerfile b/variants/2.4.6-alpine-3.8/Dockerfile index a3f4fc3..51b62c9 100644 --- a/variants/2.4.6-alpine-3.8/Dockerfile +++ b/variants/2.4.6-alpine-3.8/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.8 RUN set -eux; \ - apk add --no-cache openvpn~=2.4.6 iptables \ + apk add --no-cache openvpn~=2.4.6 iptables; \ openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh diff --git a/variants/2.4.6-alpine-3.9/Dockerfile b/variants/2.4.6-alpine-3.9/Dockerfile index 3a5df40..a0dd26a 100644 --- a/variants/2.4.6-alpine-3.9/Dockerfile +++ b/variants/2.4.6-alpine-3.9/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.9 RUN set -eux; \ - apk add --no-cache openvpn~=2.4.6 iptables \ + apk add --no-cache openvpn~=2.4.6 iptables; \ openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh diff --git a/variants/2.5.8-alpine-3.17/Dockerfile b/variants/2.5.8-alpine-3.17/Dockerfile index e607edf..6de0016 100644 --- a/variants/2.5.8-alpine-3.17/Dockerfile +++ b/variants/2.5.8-alpine-3.17/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.17 RUN set -eux; \ - apk add --no-cache openvpn~=2.5.8 iptables \ + apk add --no-cache openvpn~=2.5.8 iptables; \ openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh diff --git a/variants/2.6.5-alpine-3.18/Dockerfile b/variants/2.6.5-alpine-3.18/Dockerfile index 1565159..cb39db6 100644 --- a/variants/2.6.5-alpine-3.18/Dockerfile +++ b/variants/2.6.5-alpine-3.18/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.18 RUN set -eux; \ - apk add --no-cache openvpn~=2.6.5 iptables \ + apk add --no-cache openvpn~=2.6.5 iptables; \ openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh