Skip to content

Commit

Permalink
build: upgrade Docker to v26.1.4 (#61)
Browse files Browse the repository at this point in the history
* build: upgrade Docker to v26.1.4

* build: bump images
  • Loading branch information
masontikhonov authored Jun 20, 2024
1 parent bddd04b commit 2a1b341
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG DOCKER_VERSION=26.0.0
ARG DOCKER_VERSION=26.1.4

# dind-cleaner
FROM golang:1.22-alpine3.19 AS cleaner
FROM golang:1.22-alpine3.20 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.22-alpine3.19 AS bbolt
FROM golang:1.22-alpine3.20 AS bbolt
RUN go install go.etcd.io/bbolt/cmd/bbolt@latest

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

# Main
FROM docker:${DOCKER_VERSION}-dind

RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.19/main' >> /etc/apk/repositories \
RUN echo 'http://dl-cdn.alpinelinux.org/alpine/v3.20/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
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version: 1.28.6
version: 1.28.7

0 comments on commit 2a1b341

Please sign in to comment.