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.

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

Revert docker proxy and ecr credential provider #3081

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions packages/docker-proxy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ path = "pkg.rs"
releases-url = "https://github.com/docker/libnetwork/releases"

[[package.metadata.build-package.external-files]]
url = "https://github.com/moby/libnetwork/archive/f7cdd0e7adbf0818e384178093aa67e38ffdb112/libnetwork-f7cdd0e7adbf0818e384178093aa67e38ffdb112.tar.gz"
sha512 = "45e2acdd3cd059e6b1cc670b30e3d68b274e04b7c056ba031e0476c605b9264827defc280b20e09a339afcf853a83aae93e2fb28931df8b13dcd151a6a4da74c"
url = "https://github.com/moby/libnetwork/archive/0dde5c895075df6e3630e76f750a447cf63f4789/libnetwork-0dde5c895075df6e3630e76f750a447cf63f4789.tar.gz"
sha512 = "d73e2091c9aeefce501f5900d6c0c108d89e7970f1e091f7db4e05123536357311e65aa8210493f2386aaf4d68aac2ddf66c2c600054b87438d2f2ddd7e39584"

[build-dependencies]
glibc = { path = "../glibc" }
2 changes: 1 addition & 1 deletion packages/docker-proxy/docker-proxy.spec
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
%global goimport %{goproject}/%{gorepo}
# Use the libnetwork commit listed in this file for the docker version we ship:
# https://github.com/moby/moby/blob/DOCKER-VERSION-HERE/vendor.conf
%global commit f7cdd0e7adbf0818e384178093aa67e38ffdb112
%global commit 0dde5c895075df6e3630e76f750a447cf63f4789

%global _dwz_low_mem_die_limit 0

Expand Down
5 changes: 2 additions & 3 deletions packages/ecr-credential-provider/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ path = "pkg.rs"
releases-url = "https://github.com/kubernetes/cloud-provider-aws/releases"

[[package.metadata.build-package.external-files]]
url = "https://github.com/kubernetes/cloud-provider-aws/archive/v1.27.0/cloud-provider-aws-1.27.0.tar.gz"
sha512 = "2803871801d222e58f46fe106067c6a05c3c4792774bd653f8be2f52b536f7b6510a5209636793f11aedcb2d46fa23157b0297a02912a76f3c70284027a10b60"

url = "https://github.com/kubernetes/cloud-provider-aws/archive/v1.25.3/cloud-provider-aws-1.25.3.tar.gz"
sha512 = "d727c01ea98608b0b51edc2bfe892218b55eee7148e358e18387f3f4a52ad765f8d0ee372884e36f95f1303c13dbeba81926f7560c325a8d3c258da11cdfc24b"
bundle-modules = [ "go" ]

[build-dependencies]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
%global gorepo cloud-provider-aws
%global goimport %{goproject}/%{gorepo}

%global gover 1.27.0
%global gover 1.25.3
%global rpmver %{gover}

%global _dwz_low_mem_die_limit 0
Expand Down