mirror of
https://github.com/drone-plugins/drone-docker.git
synced 2026-07-16 16:21:18 +08:00
fix(CI-23243): bump docker dind 28.1.1 to 28.5.2 and cosign v2.5.3 to v2.6.3
Remediates vulnerabilities in harnesssecure/ecr by updating the plugins/docker base image. ECR inherits the fix via FROM plugins/docker:linux-*.
This commit is contained in:
@@ -1,9 +1,9 @@
|
||||
FROM docker:28.1.1-dind
|
||||
FROM docker:28.5.2-dind
|
||||
|
||||
ENV DOCKER_HOST=unix:///var/run/docker.sock
|
||||
|
||||
# Install cosign for container image signing
|
||||
RUN wget -O /usr/local/bin/cosign https://github.com/sigstore/cosign/releases/download/v2.5.3/cosign-linux-amd64 \
|
||||
RUN wget -O /usr/local/bin/cosign https://github.com/sigstore/cosign/releases/download/v2.6.3/cosign-linux-amd64 \
|
||||
&& chmod +x /usr/local/bin/cosign
|
||||
|
||||
ADD release/linux/amd64/drone-docker /bin/
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
FROM arm64v8/docker:28.1.1-dind
|
||||
FROM arm64v8/docker:28.5.2-dind
|
||||
|
||||
ENV DOCKER_HOST=unix:///var/run/docker.sock
|
||||
|
||||
# Install cosign for container image signing
|
||||
RUN wget -O /usr/local/bin/cosign https://github.com/sigstore/cosign/releases/download/v2.5.3/cosign-linux-arm64 \
|
||||
RUN wget -O /usr/local/bin/cosign https://github.com/sigstore/cosign/releases/download/v2.6.3/cosign-linux-arm64 \
|
||||
&& chmod +x /usr/local/bin/cosign
|
||||
|
||||
ADD release/linux/arm64/drone-docker /bin/
|
||||
|
||||
@@ -26,7 +26,7 @@ LABEL maintainer="Drone.IO Community <drone-dev@googlegroups.com>" `
|
||||
RUN mkdir C:\bin
|
||||
|
||||
# Install cosign for container image signing
|
||||
ADD https://github.com/sigstore/cosign/releases/download/v2.5.3/cosign-windows-amd64.exe C:/bin/cosign.exe
|
||||
ADD https://github.com/sigstore/cosign/releases/download/v2.6.3/cosign-windows-amd64.exe C:/bin/cosign.exe
|
||||
|
||||
COPY --from=download /windows/system32/netapi32.dll /windows/system32/netapi32.dll
|
||||
COPY --from=download /app/docker.exe C:/bin/docker.exe
|
||||
|
||||
@@ -24,7 +24,7 @@ LABEL maintainer="Drone.IO Community <drone-dev@googlegroups.com>" `
|
||||
RUN mkdir C:\bin
|
||||
|
||||
# Install cosign for container image signing
|
||||
ADD https://github.com/sigstore/cosign/releases/download/v2.5.3/cosign-windows-amd64.exe C:/bin/cosign.exe
|
||||
ADD https://github.com/sigstore/cosign/releases/download/v2.6.3/cosign-windows-amd64.exe C:/bin/cosign.exe
|
||||
|
||||
COPY --from=download /windows/system32/netapi32.dll /windows/system32/netapi32.dll
|
||||
COPY --from=download /app/docker.exe C:/bin/docker.exe
|
||||
|
||||
@@ -26,7 +26,7 @@ LABEL maintainer="Drone.IO Community <drone-dev@googlegroups.com>" `
|
||||
RUN mkdir C:\bin
|
||||
|
||||
# Install cosign for container image signing
|
||||
ADD https://github.com/sigstore/cosign/releases/download/v2.5.3/cosign-windows-amd64.exe C:/bin/cosign.exe
|
||||
ADD https://github.com/sigstore/cosign/releases/download/v2.6.3/cosign-windows-amd64.exe C:/bin/cosign.exe
|
||||
|
||||
# nanoserver:ltsc2025 ships netapi32.dll natively (unlike 1809/ltsc2022 where we
|
||||
# had to copy it in from servercore). Overwriting the ltsc2025 copy fails with
|
||||
|
||||
Reference in New Issue
Block a user