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

Added patch for EC2 IMDSv2 support in Docker #1055

Merged
merged 2 commits into from
Aug 21, 2020
Merged

Added patch for EC2 IMDSv2 support in Docker #1055

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
fe10bba
Added patch for EC2 IMDSv2 support in Docker
srgothi92 Aug 20, 2020
d1ad66e
Removed nested .gitignore and moved to packages root
srgothi92 Aug 21, 2020
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
1 change: 1 addition & 0 deletions packages/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.patch.bz2
5 changes: 5 additions & 0 deletions packages/docker-engine/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ path = "pkg.rs"
url = "https://github.com/docker/engine/archive/v19.03.12/engine-19.03.12.tar.gz"
sha512 = "51632ca8cff03440e3b76ad3e7f06b9c6275c776f4c4f9dc88cd7f5aa9b8aa8cb16ce2b3702426cb93f3714265a6cd28d4ba31612db37199e2915821b9ee8fd4"

[[package.metadata.build-package.external-files]]
tjkirch marked this conversation as resolved.
Show resolved Hide resolved
path = "awslogs_update_aws-sdk-go_to_support_imdsv2.patch.bz2"
url = "https://github.com/docker/engine/commit/44a8e10bfc794dbbc4011a62fa8ba71d948d13cf.patch"
sha512 = "36a775f5bcaf45616fcb27de1296035c6a1377f0a8b52ca5fa4e2b978b637693c04450553bc32f6d7fbd34ef1beb2aa8d05f98482290f34b5605ecec08a8465e"

[build-dependencies]
glibc = { path = "../glibc" }
libseccomp = { path = "../libseccomp" }
Expand Down
3 changes: 3 additions & 0 deletions packages/docker-engine/docker-engine.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ Source1000: clarify.toml
# https://github.com/bottlerocket-os/bottlerocket/issues/1011
Patch0001: 0001-bottlerocket-privileged-shouldn-t-disable-SELinux.patch

# Update aws-sdk-go for IMDSv2 support
Patch0100: awslogs_update_aws-sdk-go_to_support_imdsv2.patch.bz2
tjkirch marked this conversation as resolved.
Show resolved Hide resolved

BuildRequires: git
BuildRequires: %{_cross_os}glibc-devel
BuildRequires: %{_cross_os}libseccomp-devel
Expand Down
1 change: 0 additions & 1 deletion packages/kubernetes-1.16/.gitignore
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion packages/kubernetes-1.17/.gitignore
View file
Open in desktop

This file was deleted.