Skip to content

Commit 900a82f

Browse files
committed
fix: move sidecar changes to another PR
Signed-off-by: Niccolò Fei <[email protected]>
1 parent 501879a commit 900a82f

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

.github/workflows/barman-base-image.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
name: Barman Base Image
22
on:
3-
pull_request:
43
workflow_dispatch:
54
schedule:
65
- cron: "0 0 * * 0"

Taskfile.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ tasks:
378378
publish --ref {{.SIDECAR_IMAGE_NAME}} --tags {{.IMAGE_VERSION}}
379379
380380
publish-barman-base:
381-
desc: Build and publish a barman-cloud base container image (sidecar)
381+
desc: Build and publish a barman-cloud base container image
382382
vars:
383383
BARMAN_BASE_IMAGE_NAME: ghcr.io/{{.GITHUB_REPOSITORY}}-base{{if not (hasPrefix "refs/heads/main" .GITHUB_REF)}}-testing{{end}}
384384
BARMAN_VERSION:

containers/Dockerfile.sidecar

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,17 @@ COPY ../internal/ internal/
3333
RUN --mount=type=cache,target=/go/pkg/mod --mount=type=cache,target=/root/.cache/go-build \
3434
CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o manager cmd/manager/main.go
3535

36-
# Use plugin-barman-cloud-base to get the dependencies.
37-
# pip will build everything inside /usr, so we copy every file into a new
38-
# destination that will then be copied into the distroless container
39-
FROM ghcr.io/cloudnative-pg/plugin-barman-cloud-base:latest AS pythonbuilder
36+
# Build barman-cloud
37+
# pip will build everything inside /usr/ since this is the case
38+
# we should build and then copy every file into a destination that will
39+
# then copy into the distroless container
40+
FROM python:3.13-slim-bookworm AS pythonbuilder
41+
COPY containers/sidecar-requirements.txt .
42+
RUN apt-get update && \
43+
apt-get install -y postgresql-common build-essential && \
44+
/usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y && \
45+
apt-get install -y libpq-dev && \
46+
pip install -r sidecar-requirements.txt
4047
# Prepare a new /usr/ directory with the files we'll need in the final image
4148
RUN mkdir /new-usr/ && \
4249
cp -r --parents /usr/local/lib/ /usr/lib/*-linux-gnu/ /usr/local/bin/ \

0 commit comments

Comments
 (0)