From 4457f6a614299a5db60a901557230d34380e47a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Cuadrado=20Juan?= Date: Wed, 22 Jan 2025 11:03:58 +0100 Subject: [PATCH 1/3] build: Pin alpine on Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Víctor Cuadrado Juan --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0602f18d..4b83488e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -34,7 +34,7 @@ COPY ./ ./ RUN cargo install cargo-auditable RUN cargo auditable install --target x86_64-unknown-linux-musl --path . -FROM --platform=$BUILDPLATFORM alpine AS cfg +FROM --platform=$BUILDPLATFORM alpine:3.21.2 AS cfg RUN echo "policy-server:x:65533:65533::/tmp:/sbin/nologin" >> /etc/passwd RUN echo "policy-server:x:65533:policy-server" >> /etc/group From 1834c406a0fb4a2957b8c6b76314e7d90b6a17c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Cuadrado=20Juan?= Date: Wed, 22 Jan 2025 11:04:08 +0100 Subject: [PATCH 2/3] build: Use COPY instead of ADD on Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Víctor Cuadrado Juan --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4b83488e..ed4b3200 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,7 @@ COPY --from=build-arm64 --chmod=0755 /root/.cargo/bin/policy-server /policy-serv FROM copy-${TARGETARCH} COPY --from=cfg /etc/passwd /etc/passwd COPY --from=cfg /etc/group /etc/group -ADD Cargo.lock /Cargo.lock +COPY ./Cargo.lock /Cargo.lock USER 65533:65533 EXPOSE 3000 ENTRYPOINT ["/policy-server"] From 83223405b93e32643579fcc70c0d6cf29ee97861 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Cuadrado=20Juan?= Date: Wed, 22 Jan 2025 11:04:41 +0100 Subject: [PATCH 3/3] build: Bump version to 1.21.0-rc1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Víctor Cuadrado Juan --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 074ba3d9..0620491c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4370,7 +4370,7 @@ dependencies = [ [[package]] name = "policy-server" -version = "1.20.0" +version = "1.21.0-rc1" dependencies = [ "anyhow", "axum 0.8.2", diff --git a/Cargo.toml b/Cargo.toml index ec069b29..6a6bd9f1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "policy-server" -version = "1.20.0" +version = "1.21.0-rc1" authors = [ "Kubewarden Developers ", "Flavio Castelli ",