Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/registry-relay/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
ARG REGISTRY_RELAY_FEATURES="attribute-release,crosswalk-runtime"

# Keep the tag for humans and the digest for reproducible pulls.
FROM rust:1.95-trixie@sha256:f49565f188ee00bc2a18dd418183f2c5f23ef7d6e691890517ed341a598f67c3 AS builder
FROM rust:1.97-trixie@sha256:1bcff4befb740599103a2c7cb51058e14479b2e35e3a34a3f0dc4ede09927488 AS builder

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Update the Rust image contract with the bump

The changed builder tag is now out of sync with release/scripts/check-debian13-images.py, where RUST_BUILDER is still rust:1.95... and the CI step .github/workflows/ci.yml runs python3 release/scripts/check-debian13-images.py; with this commit that command fails for this Dockerfile, Dockerfile.demo, and products/notary/Dockerfile. Update the image-contract constant and the maintained image surfaces together, otherwise every PR with these Dockerfile bumps fails the required image contract check.

AGENTS.md reference: AGENTS.md:L34-L37

Useful? React with 👍 / 👎.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Update the Rust image contract with the bump

The changed builder tag is now out of sync with release/scripts/check-debian13-images.py, where RUST_BUILDER is still rust:1.95... and the CI step .github/workflows/ci.yml runs python3 release/scripts/check-debian13-images.py; with this commit that command fails for this Dockerfile, Dockerfile.demo, and products/notary/Dockerfile. Update the image-contract constant and the maintained image surfaces together, otherwise every PR with these Dockerfile bumps fails the required image contract check.

Useful? React with 👍 / 👎.

ARG REGISTRY_RELAY_FEATURES
WORKDIR /workspace/registry_relay

Expand Down
2 changes: 1 addition & 1 deletion crates/registry-relay/Dockerfile.demo
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1.7

# Keep the tag for humans and the digest for reproducible pulls.
FROM rust:1.95-trixie@sha256:f49565f188ee00bc2a18dd418183f2c5f23ef7d6e691890517ed341a598f67c3 AS builder
FROM rust:1.97-trixie@sha256:1bcff4befb740599103a2c7cb51058e14479b2e35e3a34a3f0dc4ede09927488 AS builder
WORKDIR /workspace/registry_relay

COPY Cargo.toml Cargo.lock ./
Expand Down
2 changes: 1 addition & 1 deletion products/notary/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# syntax=docker/dockerfile:1.7

# Keep the tag for humans and the digest for reproducible pulls.
FROM rust:1.95-trixie@sha256:f49565f188ee00bc2a18dd418183f2c5f23ef7d6e691890517ed341a598f67c3 AS builder
FROM rust:1.97-trixie@sha256:1bcff4befb740599103a2c7cb51058e14479b2e35e3a34a3f0dc4ede09927488 AS builder

WORKDIR /workspace/registry-notary
COPY --from=registry-platform Cargo.toml README.md LICENSE /workspace/registry-platform/
Expand Down
2 changes: 1 addition & 1 deletion release/conformance/openid/nginx.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nginx:1.27.3@sha256:bc2f6a7c8ddbccf55bdb19659ce3b0a92ca6559e86d42677a5a02ef6bda2fcef
FROM nginx:1.31.3@sha256:5a88c9c45479443d7be2eadc894b4ed0a9801bae03d97a5760ae13b5c2005942

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Update conformance pin tests with the image bump

These OpenID conformance base image bumps are not reflected in the runner's pinned-base test: release/scripts/test_openid_conformance_runner.py still asserts nginx:1.27.3@sha256: and eclipse-temurin:21@sha256:, and .github/workflows/ci.yml runs that test suite; I verified test_runtime_override_pins_built_image_bases fails immediately on this updated nginx pin. Update the assertions and the server-dev expected pin with the same bump, or release-tool CI remains red.

AGENTS.md reference: AGENTS.md:L56-L63

Useful? React with 👍 / 👎.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Badge Update conformance pin tests with the image bump

These OpenID conformance base image bumps are not reflected in the runner's pinned-base test: release/scripts/test_openid_conformance_runner.py still asserts nginx:1.27.3@sha256: and eclipse-temurin:21@sha256:, and .github/workflows/ci.yml runs that test suite; I verified test_runtime_override_pins_built_image_bases fails immediately on this updated nginx pin. Update the assertions and the server-dev expected pin with the same bump, or release-tool CI remains red.

Useful? React with 👍 / 👎.


RUN openssl req -x509 -nodes -days 3650 -newkey rsa:2048 \
-keyout /etc/ssl/private/nginx-selfsigned.key \
Expand Down
2 changes: 1 addition & 1 deletion release/conformance/openid/server-dev.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Mirrors the pinned suite's development server image while fixing its base.
FROM eclipse-temurin:21@sha256:da9d3a4f7650db39b918fc5a2c3da76556fb8cc8e5f3767cdea0bb409286951a
FROM eclipse-temurin:25@sha256:201fbb8886b2d273218aa3a192f0afbf7b5ff65ee8cc6ef47f5dce2171f013ea

RUN apt-get update \
&& apt-get install -y --no-install-recommends redir=3.3-1build1 \
Expand Down
Loading