Skip to content

Commit 0acd6c6

Browse files
fix(ci): tolerate Debian package revision updates (#10967)
1 parent ede8c28 commit 0acd6c6

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/zfnd-build-docker-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ jobs:
134134
matrix: ${{ fromJSON(needs.prepare-matrix.outputs.matrix) }}
135135
outputs:
136136
image_digest: ${{ steps.docker_build.outputs.digest || steps.docker_build_no_attestations.outputs.digest }}
137-
image_name: ${{ fromJSON(steps.docker_build.outputs.metadata || steps.docker_build_no_attestations.outputs.metadata)['image.name'] }}
137+
image_name: ${{ fromJSON(steps.docker_build.outputs.metadata || steps.docker_build_no_attestations.outputs.metadata || '{}')['image.name'] }}
138138
permissions:
139139
contents: read
140140
id-token: write

docker/Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ ENV SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH}
4040
# Install zebra build deps
4141
RUN apt-get -qq update && \
4242
apt-get -qq install -y --no-install-recommends \
43-
libclang-dev=1:19.0-63 \
44-
protobuf-compiler=3.21.12-11 \
43+
libclang-dev=1:19.0-* \
44+
protobuf-compiler=3.21.12-* \
4545
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/log/* /var/cache/ldconfig/aux-cache
4646

4747
# Build arguments and variables
@@ -92,7 +92,7 @@ ARG CARGO_TARGET_DIR
9292

9393
# Download and install cargo-nextest, curl and librocksdb-dev.
9494
RUN apt-get -qq update && \
95-
apt-get -qq install -y --no-install-recommends librocksdb-dev=9.10.0-1+b1 curl=8.14.1-2+deb13u3 && \
95+
apt-get -qq install -y --no-install-recommends librocksdb-dev=9.10.0-* curl=8.14.1-* && \
9696
mkdir -p "${CARGO_HOME}/bin" && \
9797
case ${BUILDPLATFORM:-linux/$(uname -m)} in \
9898
"linux/amd64"|"linux/x86_64") ARCH="linux" ;; \
@@ -209,8 +209,8 @@ ENV HOME=${HOME}
209209
# Install curl for healtchecks and adduser for user/group creation
210210
RUN apt-get -q update && \
211211
apt-get -q install -y --no-install-recommends \
212-
adduser=3.152 \
213-
curl=8.14.1-2+deb13u3 \
212+
adduser=3.152* \
213+
curl=8.14.1-* \
214214
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/log/* /var/cache/ldconfig/aux-cache
215215

216216
RUN addgroup --quiet --gid ${GID} ${USER} && \

0 commit comments

Comments
 (0)