marco/plugin-barman-cloud
1
0
Fork 0
mirror of https://github.com/cloudnative-pg/plugin-barman-cloud.git synced 2026-01-12 05:33:11 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: add back /usr/local/bin

Browse Source 
Signed-off-by: Niccolò Fei <niccolo.fei@enterprisedb.com>
This commit is contained in:
Niccolò Fei 2024-10-23 12:46:55 +02:00 committed by Jonathan Gonzalez V.
parent 146550cb1c
commit 6e41a87f83
No known key found for this signature in database
GPG Key ID: 43CDEF0A73A51CC5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
containers/Dockerfile.plugin
View File

@ -29,7 +29,7 @@ RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache
FROM gcr.io/distroless/static:nonroot FROM gcr.io/distroless/static:nonroot
ENV SUMMARY="CloudNativePG Barman plugin" \ ENV SUMMARY="CloudNativePG Barman plugin" \
DESCRIPTION="Container image that provides the barman-cloud plugin" \ DESCRIPTION="Container image that provides the barman-cloud plugin"
LABEL summary="$SUMMARY" \ LABEL summary="$SUMMARY" \
description="$DESCRIPTION" \ description="$DESCRIPTION" \

6
containers/Dockerfile.sidecar
View File

@ -1,5 +1,5 @@
# Sidecar # Sidecar
# The container needs to provides and build two components: # The container needs to provide and build two components:
# * barman-cloud # * barman-cloud
# * instance plugin # * instance plugin
# Both components are built before going into a distroless container # Both components are built before going into a distroless container
@ -16,7 +16,7 @@ RUN apt-get update && \
pip install barman[azure,cloud,google,snappy]==3.11.1 setuptools pip install barman[azure,cloud,google,snappy]==3.11.1 setuptools
# Prepare a new /usr/ directory with the files we'll need in the final image # Prepare a new /usr/ directory with the files we'll need in the final image
RUN mkdir /new-usr/ && \ RUN mkdir /new-usr/ && \
cp -r --parents /usr/local/lib/ /usr/lib/*-linux-gnu/ \ cp -r --parents /usr/local/lib/ /usr/lib/*-linux-gnu/ /usr/local/bin/ \
/new-usr/ /new-usr/
# Build instance # Build instance
@ -36,7 +36,7 @@ RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache
FROM gcr.io/distroless/python3:debug FROM gcr.io/distroless/python3:debug
ENV SUMMARY="CloudNativePG Barman plugin" \ ENV SUMMARY="CloudNativePG Barman plugin" \
DESCRIPTION="Container image that provides the barman-cloud sidecar" \ DESCRIPTION="Container image that provides the barman-cloud sidecar"
LABEL summary="$SUMMARY" \ LABEL summary="$SUMMARY" \
description="$DESCRIPTION" \ description="$DESCRIPTION" \