From 4f8112ffb99b813a1b46bcfc704c02e1b8821773 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Wed, 24 Jun 2020 10:54:36 -0700 Subject: [PATCH] Update to alpine:3.12 Alpine includes `/etc/ssl/cert.pem` bundle, so ca-certificates is unnecessary --- 3.7-rc/alpine/Dockerfile | 4 +--- 3.7/alpine/Dockerfile | 4 +--- 3.8-rc/alpine/Dockerfile | 4 +--- 3.8/alpine/Dockerfile | 4 +--- Dockerfile-alpine.template | 4 +--- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/3.7-rc/alpine/Dockerfile b/3.7-rc/alpine/Dockerfile index 4d782da4..323c842d 100644 --- a/3.7-rc/alpine/Dockerfile +++ b/3.7-rc/alpine/Dockerfile @@ -1,5 +1,5 @@ # Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk! -FROM alpine:3.11 +FROM alpine:3.12 RUN apk add --no-cache \ # grab su-exec for easy step-down from root @@ -37,7 +37,6 @@ RUN set -eux; \ \ apk add --no-cache --virtual .build-deps \ autoconf \ - ca-certificates \ dpkg-dev dpkg \ gcc \ gnupg \ @@ -194,7 +193,6 @@ ENV PATH=$RABBITMQ_HOME/sbin:$PATH \ RUN set -eux; \ \ apk add --no-cache --virtual .build-deps \ - ca-certificates \ gnupg \ xz \ ; \ diff --git a/3.7/alpine/Dockerfile b/3.7/alpine/Dockerfile index 169ff670..66e0dbeb 100644 --- a/3.7/alpine/Dockerfile +++ b/3.7/alpine/Dockerfile @@ -1,5 +1,5 @@ # Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk! -FROM alpine:3.11 +FROM alpine:3.12 RUN apk add --no-cache \ # grab su-exec for easy step-down from root @@ -37,7 +37,6 @@ RUN set -eux; \ \ apk add --no-cache --virtual .build-deps \ autoconf \ - ca-certificates \ dpkg-dev dpkg \ gcc \ gnupg \ @@ -194,7 +193,6 @@ ENV PATH=$RABBITMQ_HOME/sbin:$PATH \ RUN set -eux; \ \ apk add --no-cache --virtual .build-deps \ - ca-certificates \ gnupg \ xz \ ; \ diff --git a/3.8-rc/alpine/Dockerfile b/3.8-rc/alpine/Dockerfile index 7cd7e4a6..4b80f70d 100644 --- a/3.8-rc/alpine/Dockerfile +++ b/3.8-rc/alpine/Dockerfile @@ -1,5 +1,5 @@ # Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk! -FROM alpine:3.11 +FROM alpine:3.12 RUN apk add --no-cache \ # grab su-exec for easy step-down from root @@ -37,7 +37,6 @@ RUN set -eux; \ \ apk add --no-cache --virtual .build-deps \ autoconf \ - ca-certificates \ dpkg-dev dpkg \ gcc \ gnupg \ @@ -194,7 +193,6 @@ ENV PATH=$RABBITMQ_HOME/sbin:$PATH \ RUN set -eux; \ \ apk add --no-cache --virtual .build-deps \ - ca-certificates \ gnupg \ xz \ ; \ diff --git a/3.8/alpine/Dockerfile b/3.8/alpine/Dockerfile index 6329715a..a967884a 100644 --- a/3.8/alpine/Dockerfile +++ b/3.8/alpine/Dockerfile @@ -1,5 +1,5 @@ # Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk! -FROM alpine:3.11 +FROM alpine:3.12 RUN apk add --no-cache \ # grab su-exec for easy step-down from root @@ -37,7 +37,6 @@ RUN set -eux; \ \ apk add --no-cache --virtual .build-deps \ autoconf \ - ca-certificates \ dpkg-dev dpkg \ gcc \ gnupg \ @@ -194,7 +193,6 @@ ENV PATH=$RABBITMQ_HOME/sbin:$PATH \ RUN set -eux; \ \ apk add --no-cache --virtual .build-deps \ - ca-certificates \ gnupg \ xz \ ; \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index d5733f37..b255bd46 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -1,5 +1,5 @@ # Alpine Linux is not officially supported by the RabbitMQ team -- use at your own risk! -FROM alpine:3.11 +FROM alpine:3.12 RUN apk add --no-cache \ # grab su-exec for easy step-down from root @@ -37,7 +37,6 @@ RUN set -eux; \ \ apk add --no-cache --virtual .build-deps \ autoconf \ - ca-certificates \ dpkg-dev dpkg \ gcc \ gnupg \ @@ -194,7 +193,6 @@ ENV PATH=$RABBITMQ_HOME/sbin:$PATH \ RUN set -eux; \ \ apk add --no-cache --virtual .build-deps \ - ca-certificates \ gnupg \ xz \ ; \