diff --git a/generate/templates/Dockerfile.ps1 b/generate/templates/Dockerfile.ps1 index 4a6efec..5f9e0a8 100644 --- a/generate/templates/Dockerfile.ps1 +++ b/generate/templates/Dockerfile.ps1 @@ -1,7 +1,9 @@ @" FROM $( $VARIANT['_metadata']['distro'] ):$( $VARIANT['_metadata']['distro_version'] ) -RUN apk add --no-cache $( $VARIANT['_metadata']['package'] )$( if ([version]$VARIANT['_metadata']['distro_version'] -le [version]'3.6') { '>=' } else { '~=' } )$( $VARIANT['_metadata']['package_version'] ) iptables +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 \ + openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh RUN chmod +x /docker-entrypoint.sh diff --git a/variants/2.3.18-alpine-3.3/Dockerfile b/variants/2.3.18-alpine-3.3/Dockerfile index 7466a65..5ac2f5a 100644 --- a/variants/2.3.18-alpine-3.3/Dockerfile +++ b/variants/2.3.18-alpine-3.3/Dockerfile @@ -1,6 +1,8 @@ FROM alpine:3.3 -RUN apk add --no-cache openvpn>=2.3.18 iptables +RUN set -eux; \ + apk add --no-cache openvpn>=2.3.18 iptables \ + openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh RUN chmod +x /docker-entrypoint.sh diff --git a/variants/2.3.18-alpine-3.4/Dockerfile b/variants/2.3.18-alpine-3.4/Dockerfile index dff210b..53c60b0 100644 --- a/variants/2.3.18-alpine-3.4/Dockerfile +++ b/variants/2.3.18-alpine-3.4/Dockerfile @@ -1,6 +1,8 @@ FROM alpine:3.4 -RUN apk add --no-cache openvpn>=2.3.18 iptables +RUN set -eux; \ + apk add --no-cache openvpn>=2.3.18 iptables \ + openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh RUN chmod +x /docker-entrypoint.sh diff --git a/variants/2.3.18-alpine-3.5/Dockerfile b/variants/2.3.18-alpine-3.5/Dockerfile index 8d56301..4490abb 100644 --- a/variants/2.3.18-alpine-3.5/Dockerfile +++ b/variants/2.3.18-alpine-3.5/Dockerfile @@ -1,6 +1,8 @@ FROM alpine:3.5 -RUN apk add --no-cache openvpn>=2.3.18 iptables +RUN set -eux; \ + apk add --no-cache openvpn>=2.3.18 iptables \ + openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh RUN chmod +x /docker-entrypoint.sh diff --git a/variants/2.4.11-alpine-3.10/Dockerfile b/variants/2.4.11-alpine-3.10/Dockerfile index 270c608..da51498 100644 --- a/variants/2.4.11-alpine-3.10/Dockerfile +++ b/variants/2.4.11-alpine-3.10/Dockerfile @@ -1,6 +1,8 @@ FROM alpine:3.10 -RUN apk add --no-cache openvpn~=2.4.11 iptables +RUN set -eux; \ + apk add --no-cache openvpn~=2.4.11 iptables \ + openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh RUN chmod +x /docker-entrypoint.sh diff --git a/variants/2.4.11-alpine-3.11/Dockerfile b/variants/2.4.11-alpine-3.11/Dockerfile index 74ccefc..73018ea 100644 --- a/variants/2.4.11-alpine-3.11/Dockerfile +++ b/variants/2.4.11-alpine-3.11/Dockerfile @@ -1,6 +1,8 @@ FROM alpine:3.11 -RUN apk add --no-cache openvpn~=2.4.11 iptables +RUN set -eux; \ + apk add --no-cache openvpn~=2.4.11 iptables \ + openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh RUN chmod +x /docker-entrypoint.sh diff --git a/variants/2.4.12-alpine-3.12/Dockerfile b/variants/2.4.12-alpine-3.12/Dockerfile index 9cfecd8..6ff43ac 100644 --- a/variants/2.4.12-alpine-3.12/Dockerfile +++ b/variants/2.4.12-alpine-3.12/Dockerfile @@ -1,6 +1,8 @@ FROM alpine:3.12 -RUN apk add --no-cache openvpn~=2.4.12 iptables +RUN set -eux; \ + apk add --no-cache openvpn~=2.4.12 iptables \ + openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh RUN chmod +x /docker-entrypoint.sh diff --git a/variants/2.4.4-alpine-3.6/Dockerfile b/variants/2.4.4-alpine-3.6/Dockerfile index 33c45e7..1b296b4 100644 --- a/variants/2.4.4-alpine-3.6/Dockerfile +++ b/variants/2.4.4-alpine-3.6/Dockerfile @@ -1,6 +1,8 @@ FROM alpine:3.6 -RUN apk add --no-cache openvpn>=2.4.4 iptables +RUN set -eux; \ + apk add --no-cache openvpn>=2.4.4 iptables \ + openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh RUN chmod +x /docker-entrypoint.sh diff --git a/variants/2.4.4-alpine-3.7/Dockerfile b/variants/2.4.4-alpine-3.7/Dockerfile index 0f65106..5a96c3b 100644 --- a/variants/2.4.4-alpine-3.7/Dockerfile +++ b/variants/2.4.4-alpine-3.7/Dockerfile @@ -1,6 +1,8 @@ FROM alpine:3.7 -RUN apk add --no-cache openvpn~=2.4.4 iptables +RUN set -eux; \ + apk add --no-cache openvpn~=2.4.4 iptables \ + openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh RUN chmod +x /docker-entrypoint.sh diff --git a/variants/2.4.6-alpine-3.8/Dockerfile b/variants/2.4.6-alpine-3.8/Dockerfile index d9458e7..a3f4fc3 100644 --- a/variants/2.4.6-alpine-3.8/Dockerfile +++ b/variants/2.4.6-alpine-3.8/Dockerfile @@ -1,6 +1,8 @@ FROM alpine:3.8 -RUN apk add --no-cache openvpn~=2.4.6 iptables +RUN set -eux; \ + apk add --no-cache openvpn~=2.4.6 iptables \ + openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh RUN chmod +x /docker-entrypoint.sh diff --git a/variants/2.4.6-alpine-3.9/Dockerfile b/variants/2.4.6-alpine-3.9/Dockerfile index 2d78498..3a5df40 100644 --- a/variants/2.4.6-alpine-3.9/Dockerfile +++ b/variants/2.4.6-alpine-3.9/Dockerfile @@ -1,6 +1,8 @@ FROM alpine:3.9 -RUN apk add --no-cache openvpn~=2.4.6 iptables +RUN set -eux; \ + apk add --no-cache openvpn~=2.4.6 iptables \ + openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh RUN chmod +x /docker-entrypoint.sh diff --git a/variants/2.5.8-alpine-3.17/Dockerfile b/variants/2.5.8-alpine-3.17/Dockerfile index a6b27b2..e607edf 100644 --- a/variants/2.5.8-alpine-3.17/Dockerfile +++ b/variants/2.5.8-alpine-3.17/Dockerfile @@ -1,6 +1,8 @@ FROM alpine:3.17 -RUN apk add --no-cache openvpn~=2.5.8 iptables +RUN set -eux; \ + apk add --no-cache openvpn~=2.5.8 iptables \ + openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh RUN chmod +x /docker-entrypoint.sh diff --git a/variants/2.6.5-alpine-3.18/Dockerfile b/variants/2.6.5-alpine-3.18/Dockerfile index d54787e..1565159 100644 --- a/variants/2.6.5-alpine-3.18/Dockerfile +++ b/variants/2.6.5-alpine-3.18/Dockerfile @@ -1,6 +1,8 @@ FROM alpine:3.18 -RUN apk add --no-cache openvpn~=2.6.5 iptables +RUN set -eux; \ + apk add --no-cache openvpn~=2.6.5 iptables \ + openvpn --version COPY docker-entrypoint.sh /docker-entrypoint.sh RUN chmod +x /docker-entrypoint.sh