Skip to content

Commit 06149a9

Browse files
committed
chore: review
Signed-off-by: Niccolò Fei <[email protected]>
1 parent e9986c4 commit 06149a9

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ permissions:
1616

1717
jobs:
1818
build:
19-
runs-on: ubuntu-24.04
19+
runs-on: ubuntu-latest
2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@v4
22+
uses: actions/checkout@v5
2323
with:
2424
fetch-depth: 0
2525

@@ -55,8 +55,8 @@ jobs:
5555
with:
5656
image: "${{ env.IMAGE_NAME }}:latest"
5757
args: --severity-threshold=high --file=./containers/Dockerfile.barmanbase
58-
-
59-
name: Upload result to GitHub Code Scanning
58+
59+
- name: Upload result to GitHub Code Scanning
6060
uses: github/codeql-action/upload-sarif@v3
6161
with:
6262
sarif_file: snyk.sarif

containers/Dockerfile.barmanbase

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
FROM python:3.13-slim AS pythonbuilder
1+
FROM python:3.13-slim-bookworm
2+
COPY containers/sidecar-requirements.txt .
23
RUN apt-get update && \
34
apt-get install -y postgresql-common build-essential && \
45
/usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y && \
56
apt-get install -y libpq-dev && \
6-
pip install barman[azure,cloud,google,snappy]==3.11.1 setuptools
7+
pip install -r sidecar-requirements.txt

containers/Dockerfile.sidecar

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ 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 plug-barman-cloud-base to get the dependencies
37-
# pip will build everything inside /usr/ since this is the case
38-
# Copy every file into a destination that will then copy into the distroless container
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
3939
FROM ghcr.io/cloudnative-pg/plugin-barman-cloud-base:latest AS pythonbuilder
4040
# Prepare a new /usr/ directory with the files we'll need in the final image
4141
RUN mkdir /new-usr/ && \

0 commit comments

Comments
 (0)