Skip to content

fix(agent): pin the published Brotli-patched base #375

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chen21019 merged 1 commit into from
Oct 25, 2026
Merged

fix(agent): pin the published Brotli-patched base #375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions agent/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/pasturestack/node-agent-base:v0.3.7@sha256:b21453fae656ba81cb427e5f165fd07aff8daee2459d9c4902e200652e9c9632
FROM ghcr.io/pasturestack/node-agent-base:v0.3.8@sha256:d6c391a2b8c8a36747a33a9fd17a8692439809be95c8bccaa586bd48097a73b7
ARG VCS_REF
COPY control_plane_url.py register.py resolve_url.py run.sh /
COPY loglevel /usr/bin/loglevel
Expand All @@ -8,9 +8,9 @@ LABEL "io.rancher.container.system"="rancher-agent" \
org.opencontainers.image.source="https://github.com/PastureStack/server" \
org.opencontainers.image.description="PastureStack node-agent compatibility image." \
org.opencontainers.image.licenses="Apache-2.0" \
org.opencontainers.image.version="v1.2.33" \
org.opencontainers.image.version="v1.2.34" \
org.opencontainers.image.revision=$VCS_REF
RUN test -s /usr/bin/share-mnt && \
chmod +x /run.sh /register.py /resolve_url.py /usr/bin/share-mnt /usr/bin/loglevel && \
chmod 0644 /control_plane_url.py
ENV RANCHER_AGENT_IMAGE=ghcr.io/pasturestack/node-agent:v1.2.33
ENV RANCHER_AGENT_IMAGE=ghcr.io/pasturestack/node-agent:v1.2.34
6 changes: 3 additions & 3 deletions scripts/build-agent-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ python3 scripts/test-agent-package-consistency.py

case "${COMPONENT:-}" in
base) repository=ghcr.io/pasturestack/node-agent-base; version=v0.3.8 ;;
agent) repository=ghcr.io/pasturestack/node-agent; version=v1.2.33 ;;
agent) repository=ghcr.io/pasturestack/node-agent; version=v1.2.34 ;;
*) echo 'Unsupported agent component' >&2; exit 1 ;;
esac
[[ "${PUBLISH:-false}" = true || "${PUBLISH:-false}" = false ]]
Expand Down Expand Up @@ -80,8 +80,8 @@ if [[ "$COMPONENT" = base ]]; then
SHARE_MNT_BIN="$scratch/share-mnt" R_BIN="$scratch/r" IMAGE="$candidate" \
bash agent-base/build-image.sh |& tee "$evidence/build.log"
else
grep -Eq '^FROM ghcr.io/pasturestack/node-agent-base:v0\.3\.7@sha256:[0-9a-f]{64}$' agent/Dockerfile
grep -Fq 'org.opencontainers.image.version="v1.2.33"' agent/Dockerfile
grep -Eq '^FROM ghcr.io/pasturestack/node-agent-base:v0\.3\.8@sha256:[0-9a-f]{64}$' agent/Dockerfile
grep -Fq 'org.opencontainers.image.version="v1.2.34"' agent/Dockerfile
IMAGE="$candidate" bash agent/build-image.sh |& tee "$evidence/build.log"
fi

Expand Down
8 changes: 4 additions & 4 deletions scripts/check-agent-base-downloads.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ require_marker agent-base/build-image.sh 'R_BIN="${R_BIN:-}"' AGENT_BASE_BUILD_N
require_marker agent-base/build-image.sh 'cp "$R_BIN" "$tmpdir/r"' AGENT_BASE_BUILD_NETWORK_HELPER_CONTEXT_COPY_MISSING
require_marker agent-base/build-image.sh 'cp ../server/bin/update-platform-ssl "$tmpdir/update-platform-ssl"' AGENT_BASE_BUILD_SSL_SCRIPT_CONTEXT_COPY_MISSING

require_marker agent/Dockerfile 'FROM ghcr.io/pasturestack/node-agent-base:v0.3.7@sha256:b21453fae656ba81cb427e5f165fd07aff8daee2459d9c4902e200652e9c9632' AGENT_DOCKERFILE_BASE_NOT_UPDATED
require_marker agent/Dockerfile 'org.opencontainers.image.version="v1.2.33"' AGENT_DOCKERFILE_VERSION_NOT_ROLLED_FORWARD
require_marker agent/Dockerfile 'ENV RANCHER_AGENT_IMAGE=ghcr.io/pasturestack/node-agent:v1.2.33' AGENT_DOCKERFILE_SELF_IMAGE_NOT_ROLLED_FORWARD
require_marker agent/Dockerfile 'FROM ghcr.io/pasturestack/node-agent-base:v0.3.8@sha256:d6c391a2b8c8a36747a33a9fd17a8692439809be95c8bccaa586bd48097a73b7' AGENT_DOCKERFILE_BASE_NOT_UPDATED
require_marker agent/Dockerfile 'org.opencontainers.image.version="v1.2.34"' AGENT_DOCKERFILE_VERSION_NOT_ROLLED_FORWARD
require_marker agent/Dockerfile 'ENV RANCHER_AGENT_IMAGE=ghcr.io/pasturestack/node-agent:v1.2.34' AGENT_DOCKERFILE_SELF_IMAGE_NOT_ROLLED_FORWARD
require_marker agent/Dockerfile 'io.pasturestack.container.system="node-agent"' AGENT_DOCKERFILE_PASTURESTACK_SYSTEM_LABEL_MISSING
require_marker agent/Dockerfile 'COPY loglevel /usr/bin/loglevel' AGENT_DOCKERFILE_LOGLEVEL_NOT_CONTEXT_BACKED
require_marker agent/Dockerfile 'RUN test -s /usr/bin/share-mnt && \' AGENT_DOCKERFILE_BASE_SHARE_MNT_NONEMPTY_CHECK_MISSING
Expand Down Expand Up @@ -95,4 +95,4 @@ if [ "$failure_count" -ne 0 ]; then
exit 1
fi

printf 'AGENT_BASE_DOWNLOADS_OK base=v0.3.8 agent=v1.2.33 base_share_mnt_nonempty=1 tracked_loglevel=1 docker_cli=29.9.2 python_sha=1 docker_sha=1 remote_legacy_helpers=0\n'
printf 'AGENT_BASE_DOWNLOADS_OK base=v0.3.8 agent=v1.2.34 base_share_mnt_nonempty=1 tracked_loglevel=1 docker_cli=29.9.2 python_sha=1 docker_sha=1 remote_legacy_helpers=0\n'