cache more 3?

rabbitmq · Jan 24, 2025 · d31bbc4 · d31bbc4
1 parent 6013f7e
commit d31bbc4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 19 deletions.
diff --git a/.github/workflows/oci-make.yaml b/.github/workflows/oci-make.yaml
@@ -101,12 +101,9 @@ jobs:
           push: true
           context: packaging/docker-image
           platforms: linux/amd64, linux/arm64
-          #labels: ${{ steps.meta.outputs.labels }}
           tags: ${{ steps.meta.outputs.tags }}
-          #tags: pivotalrabbitmq/rabbitmq-test:otp${{ matrix.otp_version }}
           cache-to: type=gha,mode=max
           cache-from: type=gha
-          #outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
           build-args:
             OTP_VERSION=${{ matrix.otp_version }}
 

diff --git a/packaging/docker-image/Dockerfile b/packaging/docker-image/Dockerfile
@@ -1,6 +1,22 @@
 ARG OTP_VERSION="27"
 
-FROM erlang:${OTP_VERSION}-slim
+FROM erlang:${OTP_VERSION}-slim AS base
+
+RUN set -eux; \
+	export DEBIAN_FRONTEND=noninteractive; \
+	apt-get update; \
+	apt-get install --yes --no-install-recommends \
+		ca-certificates \
+		gosu \
+		tzdata \
+		gnupg \
+		wget \
+		xz-utils \
+	; \
+	rm -rf /var/lib/apt/lists/*; \
+	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false;
+
+FROM base AS rabbitmq
 
 ENV RABBITMQ_DATA_DIR=/var/lib/rabbitmq
 
@@ -23,21 +39,6 @@ ENV PATH=$RABBITMQ_HOME/sbin:$PATH
 
 COPY package-generic-unix.tar.xz /usr/local/src/rabbitmq-$RABBITMQ_VERSION.tar.xz
 
-RUN set -eux; \
-	export DEBIAN_FRONTEND=noninteractive; \
-	apt-get update; \
-	apt-get install --yes --no-install-recommends \
-		ca-certificates \
-		gosu \
-		tzdata \
-		gnupg \
-		wget \
-		xz-utils \
-	; \
-	rm -rf /var/lib/apt/lists/*; \
-	apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false;
-
-# Install RabbitMQ
 RUN set -eux; \
 	RABBITMQ_PATH="/usr/local/src/rabbitmq-$RABBITMQ_VERSION"; \
 	mkdir -p "$RABBITMQ_HOME"; \