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

Jump to bottom

build: upgrade dependencies #67

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

build: upgrade dependencies #67

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
4e70c3f
build: upgrade dependencies
masontikhonov Sep 8, 2024
2c3f389
ci: bump version
masontikhonov Sep 8, 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
8 changes: 4 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG DOCKER_VERSION=26.1.4
ARG DOCKER_VERSION=27.2.0

# dind-cleaner
FROM golang:1.22-alpine3.20 AS cleaner
FROM golang:1.23-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,11 +15,11 @@ RUN CGO_ENABLED=0 go build -o /usr/local/bin/dind-cleaner ./cmd && \
rm -rf /go/*

# bbolt
FROM golang:1.22-alpine3.20 AS bbolt
FROM golang:1.23-alpine3.20 AS bbolt
RUN go install go.etcd.io/bbolt/cmd/bbolt@latest

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

# Main
FROM docker:${DOCKER_VERSION}-dind
Expand Down
6 changes: 3 additions & 3 deletions cleaner/dind-cleaner/cmd/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"os"
"time"

"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/image"
"github.com/docker/docker/client"
"github.com/golang/glog"
"golang.org/x/net/context"
Expand Down Expand Up @@ -106,7 +106,7 @@ func cleanImages(retainedImagesList []string, retainPeriod int64) {

// 1. Get All Images
ctx := context.Background()
imagesFullList, err := cli.ImageList(ctx, types.ImageListOptions{All: true})
imagesFullList, err := cli.ImageList(ctx, image.ListOptions{All: true})
if err != nil {
panic(err)
}
Expand Down Expand Up @@ -176,7 +176,7 @@ func cleanImages(retainedImagesList []string, retainPeriod int64) {
// add image delete here
var err error
if !*dryRun {
_, err = cli.ImageRemove(ctx, imageID, types.ImageRemoveOptions{Force: true, PruneChildren: false})
_, err = cli.ImageRemove(ctx, imageID, image.RemoveOptions{Force: true, PruneChildren: false})
} else {
glog.Infof("DRY RUN - do not actually delete")
}
Expand Down
2 changes: 1 addition & 1 deletion cleaner/dind-cleaner/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/codefresh-io/dind-cleaner
go 1.22

require (
github.com/docker/docker v26.0.0+incompatible
github.com/docker/docker v27.2.0+incompatible
github.com/golang/glog v1.1.2
golang.org/x/net v0.22.0
)
Expand Down
4 changes: 2 additions & 2 deletions cleaner/dind-cleaner/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
github.com/docker/docker v26.0.0+incompatible h1:Ng2qi+gdKADUa/VM+6b6YaY2nlZhk/lVJiKR/2bMudU=
github.com/docker/docker v26.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v27.2.0+incompatible h1:Rk9nIVdfH3+Vz4cyI/uhbINhEZ/oLmc+CBXmH6fbNk4=
github.com/docker/docker v27.2.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/go-connections v0.4.1-0.20180821093606-97c2040d34df h1:cGbd/ECh4QPOc6+Tbvdk5NjCcOYESiwc1RjXp0XciVg=
github.com/docker/go-connections v0.4.1-0.20180821093606-97c2040d34df/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
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.7
version: 1.28.8