From fe10bba4090fe7c64146cd2714495f8f90d17e5e Mon Sep 17 00:00:00 2001
From: srgothi92 <gothisg@amazon.com>
Date: Thu, 20 Aug 2020 21:57:45 +0000
Subject: [PATCH 1/2] Added patch for EC2 IMDSv2 support in Docker

* Fixed peer review comments
* Changed url paramter to actual patch external URL
---
 packages/docker-engine/Cargo.toml         | 5 +++++
 packages/docker-engine/docker-engine.spec | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/packages/docker-engine/Cargo.toml b/packages/docker-engine/Cargo.toml
index f1bc873bc76..ba7e8ae7621 100644
--- 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
index 02399a83c99..44ffed7126e 100644
--- 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

From d1ad66eac33c4804e13ae553ad27928e7fb76850 Mon Sep 17 00:00:00 2001
From: srgothi92 <gothisg@amazon.com>
Date: Fri, 21 Aug 2020 16:16:32 +0000
Subject: [PATCH 2/2] Removed nested .gitignore and moved to packages root

---
 packages/.gitignore                 | 1 +
 packages/kubernetes-1.16/.gitignore | 1 -
 packages/kubernetes-1.17/.gitignore | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 packages/.gitignore
 delete mode 100644 packages/kubernetes-1.16/.gitignore
 delete mode 100644 packages/kubernetes-1.17/.gitignore

diff --git a/packages/.gitignore b/packages/.gitignore
new file mode 100644
index 00000000000..7102c73b4c0
--- /dev/null
+++ b/packages/.gitignore
@@ -0,0 +1 @@
+*.patch.bz2
diff --git a/packages/kubernetes-1.16/.gitignore b/packages/kubernetes-1.16/.gitignore
deleted file mode 100644
index 4eea2fc7eff..00000000000
--- a/packages/kubernetes-1.16/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.patch.bz2
diff --git a/packages/kubernetes-1.17/.gitignore b/packages/kubernetes-1.17/.gitignore
deleted file mode 100644
index 4eea2fc7eff..00000000000
--- a/packages/kubernetes-1.17/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/*.patch.bz2