Skip to content
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

build: fix security vulnerabilities #54

Merged
merged 2 commits into from
Mar 24, 2024
Merged

build: fix security vulnerabilities #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebcf539
build: fix security vulnerabilities
masontikhonov Mar 13, 2024
1fe02d4
Merge branch 'master' into CR-22904-dind-critical-and-high-vulnerabil…
Mar 14, 2024
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
10 changes: 5 additions & 5 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG DOCKER_VERSION=24.0.6
ARG DOCKER_VERSION=25.0.4

# dind-cleaner
FROM golang:1.21-alpine3.18 AS cleaner
FROM golang:1.22-alpine3.19 AS cleaner

COPY cleaner/dind-cleaner/* /go/src/github.com/codefresh-io/dind-cleaner/
WORKDIR /go/src/github.com/codefresh-io/dind-cleaner/
Expand All @@ -15,16 +15,16 @@ RUN CGO_ENABLED=0 go build -o /usr/local/bin/dind-cleaner ./cmd && \
rm -rf /go/*

# bbolt
FROM golang:1.21-alpine3.18 AS bbolt
FROM golang:1.22-alpine3.19 AS bbolt
RUN go install go.etcd.io/bbolt/cmd/bbolt@latest

# node-exporter
FROM quay.io/prometheus/node-exporter:v1.6.1 AS node-exporter
FROM quay.io/prometheus/node-exporter:v1.7.0 AS node-exporter

# Main
FROM docker:${DOCKER_VERSION}-dind

RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.11/main' >> /etc/apk/repositories \
RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.19/main' >> /etc/apk/repositories \
&& apk upgrade \
# Add fuse-overlayfs for comaptibility with rootless. Volumes created with rootless might use fuse-overlay formatted volumes. If those volumes are later used by dind that runs with root it'll require fuse-overlay to be able to read the volume
&& apk add bash fuse-overlayfs jq --no-cache \
Expand Down
2 changes: 1 addition & 1 deletion service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version: 1.28.3
version: 1.28.4