diff --git a/2.0/Dockerfile b/2.0/Dockerfile index c760bc5..96e7b29 100644 --- a/2.0/Dockerfile +++ b/2.0/Dockerfile @@ -6,6 +6,15 @@ FROM debian:buster-slim +# runtime dependencies +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ +# @system-ca: https://github.com/docker-library/haproxy/pull/216 + ca-certificates \ + ; \ + rm -rf /var/lib/apt/lists/* + # roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6 RUN set -eux; \ groupadd --gid 99 --system haproxy; \ @@ -29,7 +38,6 @@ RUN set -eux; \ \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates \ gcc \ libc6-dev \ liblua5.3-dev \ diff --git a/2.0/alpine/Dockerfile b/2.0/alpine/Dockerfile index bf8e3c1..f4ca1fd 100644 --- a/2.0/alpine/Dockerfile +++ b/2.0/alpine/Dockerfile @@ -6,6 +6,13 @@ FROM alpine:3.16 +# runtime dependencies +RUN set -eux; \ + apk add --no-cache \ +# @system-ca: https://github.com/docker-library/haproxy/pull/216 + ca-certificates \ + ; + # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable RUN set -eux; \ addgroup --gid 99 --system haproxy; \ diff --git a/2.2/Dockerfile b/2.2/Dockerfile index 24ce9dd..3ce09ad 100644 --- a/2.2/Dockerfile +++ b/2.2/Dockerfile @@ -6,6 +6,15 @@ FROM debian:bullseye-slim +# runtime dependencies +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ +# @system-ca: https://github.com/docker-library/haproxy/pull/216 + ca-certificates \ + ; \ + rm -rf /var/lib/apt/lists/* + # roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6 RUN set -eux; \ groupadd --gid 99 --system haproxy; \ @@ -29,7 +38,6 @@ RUN set -eux; \ \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates \ gcc \ libc6-dev \ liblua5.3-dev \ diff --git a/2.2/alpine/Dockerfile b/2.2/alpine/Dockerfile index d6b7ab5..e638b45 100644 --- a/2.2/alpine/Dockerfile +++ b/2.2/alpine/Dockerfile @@ -6,6 +6,13 @@ FROM alpine:3.16 +# runtime dependencies +RUN set -eux; \ + apk add --no-cache \ +# @system-ca: https://github.com/docker-library/haproxy/pull/216 + ca-certificates \ + ; + # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable RUN set -eux; \ addgroup --gid 99 --system haproxy; \ diff --git a/2.4/Dockerfile b/2.4/Dockerfile index e7f8c2c..6069602 100644 --- a/2.4/Dockerfile +++ b/2.4/Dockerfile @@ -6,6 +6,15 @@ FROM debian:bookworm-slim +# runtime dependencies +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ +# @system-ca: https://github.com/docker-library/haproxy/pull/216 + ca-certificates \ + ; \ + rm -rf /var/lib/apt/lists/* + # roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6 RUN set -eux; \ groupadd --gid 99 --system haproxy; \ @@ -29,7 +38,6 @@ RUN set -eux; \ \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates \ gcc \ libc6-dev \ liblua5.3-dev \ diff --git a/2.4/alpine/Dockerfile b/2.4/alpine/Dockerfile index 1ab20b9..bba2f15 100644 --- a/2.4/alpine/Dockerfile +++ b/2.4/alpine/Dockerfile @@ -6,6 +6,13 @@ FROM alpine:3.19 +# runtime dependencies +RUN set -eux; \ + apk add --no-cache \ +# @system-ca: https://github.com/docker-library/haproxy/pull/216 + ca-certificates \ + ; + # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable RUN set -eux; \ addgroup --gid 99 --system haproxy; \ diff --git a/2.6/Dockerfile b/2.6/Dockerfile index 233e7b4..4e32186 100644 --- a/2.6/Dockerfile +++ b/2.6/Dockerfile @@ -6,6 +6,15 @@ FROM debian:bookworm-slim +# runtime dependencies +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ +# @system-ca: https://github.com/docker-library/haproxy/pull/216 + ca-certificates \ + ; \ + rm -rf /var/lib/apt/lists/* + # roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6 RUN set -eux; \ groupadd --gid 99 --system haproxy; \ @@ -29,7 +38,6 @@ RUN set -eux; \ \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates \ gcc \ libc6-dev \ liblua5.3-dev \ diff --git a/2.6/alpine/Dockerfile b/2.6/alpine/Dockerfile index 0f21077..d39007e 100644 --- a/2.6/alpine/Dockerfile +++ b/2.6/alpine/Dockerfile @@ -6,6 +6,13 @@ FROM alpine:3.19 +# runtime dependencies +RUN set -eux; \ + apk add --no-cache \ +# @system-ca: https://github.com/docker-library/haproxy/pull/216 + ca-certificates \ + ; + # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable RUN set -eux; \ addgroup --gid 99 --system haproxy; \ diff --git a/2.7/Dockerfile b/2.7/Dockerfile index 97fff68..99bf5e6 100644 --- a/2.7/Dockerfile +++ b/2.7/Dockerfile @@ -6,6 +6,15 @@ FROM debian:bookworm-slim +# runtime dependencies +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ +# @system-ca: https://github.com/docker-library/haproxy/pull/216 + ca-certificates \ + ; \ + rm -rf /var/lib/apt/lists/* + # roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6 RUN set -eux; \ groupadd --gid 99 --system haproxy; \ @@ -29,7 +38,6 @@ RUN set -eux; \ \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates \ gcc \ libc6-dev \ liblua5.3-dev \ diff --git a/2.7/alpine/Dockerfile b/2.7/alpine/Dockerfile index 7cadd4f..f7de12d 100644 --- a/2.7/alpine/Dockerfile +++ b/2.7/alpine/Dockerfile @@ -6,6 +6,13 @@ FROM alpine:3.19 +# runtime dependencies +RUN set -eux; \ + apk add --no-cache \ +# @system-ca: https://github.com/docker-library/haproxy/pull/216 + ca-certificates \ + ; + # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable RUN set -eux; \ addgroup --gid 99 --system haproxy; \ diff --git a/2.8/Dockerfile b/2.8/Dockerfile index 62dfa03..faf47bb 100644 --- a/2.8/Dockerfile +++ b/2.8/Dockerfile @@ -6,6 +6,15 @@ FROM debian:bookworm-slim +# runtime dependencies +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ +# @system-ca: https://github.com/docker-library/haproxy/pull/216 + ca-certificates \ + ; \ + rm -rf /var/lib/apt/lists/* + # roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6 RUN set -eux; \ groupadd --gid 99 --system haproxy; \ @@ -29,7 +38,6 @@ RUN set -eux; \ \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates \ gcc \ libc6-dev \ liblua5.3-dev \ diff --git a/2.8/alpine/Dockerfile b/2.8/alpine/Dockerfile index 4cbc6af..ac04bce 100644 --- a/2.8/alpine/Dockerfile +++ b/2.8/alpine/Dockerfile @@ -6,6 +6,13 @@ FROM alpine:3.19 +# runtime dependencies +RUN set -eux; \ + apk add --no-cache \ +# @system-ca: https://github.com/docker-library/haproxy/pull/216 + ca-certificates \ + ; + # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable RUN set -eux; \ addgroup --gid 99 --system haproxy; \ diff --git a/2.9/Dockerfile b/2.9/Dockerfile index 0417214..d60d7ed 100644 --- a/2.9/Dockerfile +++ b/2.9/Dockerfile @@ -6,6 +6,15 @@ FROM debian:bookworm-slim +# runtime dependencies +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ +# @system-ca: https://github.com/docker-library/haproxy/pull/216 + ca-certificates \ + ; \ + rm -rf /var/lib/apt/lists/* + # roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6 RUN set -eux; \ groupadd --gid 99 --system haproxy; \ @@ -29,7 +38,6 @@ RUN set -eux; \ \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates \ gcc \ libc6-dev \ liblua5.4-dev \ diff --git a/2.9/alpine/Dockerfile b/2.9/alpine/Dockerfile index 644e13b..973aa8d 100644 --- a/2.9/alpine/Dockerfile +++ b/2.9/alpine/Dockerfile @@ -6,6 +6,13 @@ FROM alpine:3.19 +# runtime dependencies +RUN set -eux; \ + apk add --no-cache \ +# @system-ca: https://github.com/docker-library/haproxy/pull/216 + ca-certificates \ + ; + # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable RUN set -eux; \ addgroup --gid 99 --system haproxy; \ diff --git a/3.0/Dockerfile b/3.0/Dockerfile index 8865a4c..a26b3e3 100644 --- a/3.0/Dockerfile +++ b/3.0/Dockerfile @@ -6,6 +6,15 @@ FROM debian:bookworm-slim +# runtime dependencies +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ +# @system-ca: https://github.com/docker-library/haproxy/pull/216 + ca-certificates \ + ; \ + rm -rf /var/lib/apt/lists/* + # roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6 RUN set -eux; \ groupadd --gid 99 --system haproxy; \ @@ -29,7 +38,6 @@ RUN set -eux; \ \ savedAptMark="$(apt-mark showmanual)"; \ apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates \ gcc \ libc6-dev \ liblua5.4-dev \ diff --git a/3.0/alpine/Dockerfile b/3.0/alpine/Dockerfile index 4770ab7..ccc5773 100644 --- a/3.0/alpine/Dockerfile +++ b/3.0/alpine/Dockerfile @@ -6,6 +6,13 @@ FROM alpine:3.19 +# runtime dependencies +RUN set -eux; \ + apk add --no-cache \ +# @system-ca: https://github.com/docker-library/haproxy/pull/216 + ca-certificates \ + ; + # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable RUN set -eux; \ addgroup --gid 99 --system haproxy; \ diff --git a/Dockerfile.template b/Dockerfile.template index 5f5b5c7..24c86d2 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -1,6 +1,13 @@ {{ if env.variant == "alpine" then ( -}} FROM alpine:{{ .alpine }} +# runtime dependencies +RUN set -eux; \ + apk add --no-cache \ +# @system-ca: https://github.com/docker-library/haproxy/pull/216 + ca-certificates \ + ; + # roughly, https://git.alpinelinux.org/aports/tree/main/haproxy/haproxy.pre-install?h=3.12-stable RUN set -eux; \ addgroup --gid 99 --system haproxy; \ @@ -18,6 +25,15 @@ RUN set -eux; \ {{ ) else ( -}} FROM debian:{{ .debian }} +# runtime dependencies +RUN set -eux; \ + apt-get update; \ + apt-get install -y --no-install-recommends \ +# @system-ca: https://github.com/docker-library/haproxy/pull/216 + ca-certificates \ + ; \ + rm -rf /var/lib/apt/lists/* + # roughly, https://salsa.debian.org/haproxy-team/haproxy/-/blob/732b97ae286906dea19ab5744cf9cf97c364ac1d/debian/haproxy.postinst#L5-6 RUN set -eux; \ groupadd --gid 99 --system haproxy; \ @@ -72,7 +88,6 @@ RUN set -eux; \ {{ ) else ( -}} savedAptMark="$(apt-mark showmanual)"; \ apt-get update && apt-get install -y --no-install-recommends \ - ca-certificates \ gcc \ libc6-dev \ liblua{{ lua }}-dev \