From 50dc2fae771c6720b77eeb431e90a2cb300b9b5c Mon Sep 17 00:00:00 2001 From: Alexander Bayandin Date: Tue, 6 May 2025 11:52:21 +0100 Subject: [PATCH] compute-node.Dockerfile: remove layer with duplicated name (#11807) ## Problem Two `rust-extensions-build-pgrx14` layers were added independently in two different PRs, and the layers are exactly the same ## Summary of changes - Remove one of `rust-extensions-build-pgrx14` layers --- compute/compute-node.Dockerfile | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/compute/compute-node.Dockerfile b/compute/compute-node.Dockerfile index cc338cec6a..8766eb519e 100644 --- a/compute/compute-node.Dockerfile +++ b/compute/compute-node.Dockerfile @@ -1084,23 +1084,12 @@ RUN cargo install --locked --version 0.12.9 cargo-pgrx && \ /bin/bash -c 'cargo pgrx init --pg${PG_VERSION:1}=/usr/local/pgsql/bin/pg_config' USER root + ######################################################################################### # # Layer "rust extensions pgrx14" # -######################################################################################### -FROM pg-build-nonroot-with-cargo AS rust-extensions-build-pgrx14 -ARG PG_VERSION - -RUN cargo install --locked --version 0.14.1 cargo-pgrx && \ - /bin/bash -c 'cargo pgrx init --pg${PG_VERSION:1}=/usr/local/pgsql/bin/pg_config' - -USER root -######################################################################################### -# -# Layer "rust extensions pgrx14" -# -# Version 14 is now required by a few +# Version 14 is now required by a few # This layer should be used as a base for new pgrx extensions, # and eventually get merged with `rust-extensions-build` #