Skip to content

Commit

Permalink
use s2i fork with updated docker
Browse files Browse the repository at this point in the history
  • Loading branch information
lkingland committed Mar 30, 2022
1 parent 7e5e3ea commit ff8ac0e
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 439 deletions.
6 changes: 1 addition & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@ require (

replace (
github.com/buildpacks/imgutil => github.com/buildpacks/imgutil v0.0.0-20211001201950-cf7ae41c3771 // pack: force newer version of imgutil for better performance until pack updates
// github.com/containerd/containerd v1.3.0-0.20190507210959-7c1e88399ec0 => github.com/containerd/containerd v1.2.1-0.20190507210959-7c1e88399ec0 // s2i: fix transitive dependency's invalid pseudo-version
// github.com/docker/docker v1.14.0-0.20190319215453-e7b5f7dbe98c => github.com/docker/docker v17.12.0-ce-rc1.0.20190319215453-e7b5f7dbe98c+incompatible
// golang.org/x/crypto v0.0.0-20190129210102-0709b304e793 => golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 // s2i: fix transitive dependency's invalid pseudo-version

github.com/openshift/source-to-image => github.com/lkingland/source-to-image v1.3.2 // updates docker to be compatible with version used by pack and removes invalid pseudo-version
// github.com/openshift/source-to-image => ../../github.com/lkingland/source-to-image // s2i: updates docker to be compatible with pack, removing pseudo-version
github.com/openshift/source-to-image => github.com/boson-project/source-to-image v1.3.2 // updates docker to be compatible with version used by pack and removes invalid pseudo-version
)
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,8 @@ github.com/bombsimon/wsl/v2 v2.2.0/go.mod h1:Azh8c3XGEJl9LyX0/sFC+CKMc7Ssgua0g+6
github.com/bombsimon/wsl/v3 v3.0.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc=
github.com/bombsimon/wsl/v3 v3.1.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc=
github.com/bombsimon/wsl/v3 v3.3.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc=
github.com/boson-project/source-to-image v1.3.2 h1:jy0MQCbc6Ix/SrK9YUeuYUVP5XRFos15I5flTXC6GlY=
github.com/boson-project/source-to-image v1.3.2/go.mod h1:uT4SRJAhYbi9VbTIL0Os+0TTwTgqKwNydy7LoXrQ7v4=
github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
github.com/breml/bidichk v0.1.1/go.mod h1:zbfeitpevDUGI7V91Uzzuwrn4Vls8MoBMrwtt78jmso=
github.com/bshuster-repo/logrus-logstash-hook v0.4.1/go.mod h1:zsTqEiSzDgAa/8GZR7E1qaXrhYNDKBYy5/dWPTIflbk=
Expand Down Expand Up @@ -1460,8 +1462,6 @@ github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-b
github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4=
github.com/lightstep/tracecontext.go v0.0.0-20181129014701-1757c391b1ac/go.mod h1:Frd2bnT3w5FB5q49ENTfVlztJES+1k/7lyWX2+9gq/M=
github.com/linuxkit/virtsock v0.0.0-20201010232012-f8cee7dfc7a3/go.mod h1:3r6x7q95whyfWQpmGZTu3gk3v2YkMi05HEzl7Tf7YEo=
github.com/lkingland/source-to-image v1.3.2 h1:sKKqo0rugoHQcgq2ZsS/450s2VQPm8bh7KCnD0dvpY0=
github.com/lkingland/source-to-image v1.3.2/go.mod h1:uT4SRJAhYbi9VbTIL0Os+0TTwTgqKwNydy7LoXrQ7v4=
github.com/logrusorgru/aurora v0.0.0-20181002194514-a7b3b318ed4e/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s=
github.com/lucasb-eyer/go-colorful v1.0.3/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
Expand Down
202 changes: 0 additions & 202 deletions third_party/VENDOR-LICENSE/github.com/moby/sys/mount/LICENSE

This file was deleted.

Loading

0 comments on commit ff8ac0e

Please sign in to comment.