Merge pull request #1055 from srgothi92/develop

Added patch for EC2 IMDSv2 support in Docker
bottlerocket-os · Aug 21, 2020 · 6fadde5 · 6fadde5
2 parents 5110e8c + d1ad66e
commit 6fadde5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/packages/.gitignore b/packages/.gitignore
@@ -0,0 +1 @@
+*.patch.bz2
diff --git a/packages/docker-engine/Cargo.toml b/packages/docker-engine/Cargo.toml
@@ -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]]
+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" }

diff --git a/packages/docker-engine/docker-engine.spec b/packages/docker-engine/docker-engine.spec
@@ -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
+
 BuildRequires: git
 BuildRequires: %{_cross_os}glibc-devel
 BuildRequires: %{_cross_os}libseccomp-devel

diff --git a/packages/kubernetes-1.16/.gitignore b/packages/kubernetes-1.16/.gitignore
diff --git a/packages/kubernetes-1.17/.gitignore b/packages/kubernetes-1.17/.gitignore