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

Rollback amazonlinux releases. This reverts commit 20b02e5. #18247

Merged
merged 1 commit into from
Jan 15, 2025

Conversation

sktomer
Copy link
Contributor

@sktomer sktomer commented Jan 15, 2025

This reverts commit 20b02e5.

The new releases are configured with repositories pulling in an rsync security fix. However the patch has a regression reported upstream and hence as a precaution, we want to rollback to previous known good images.

The new releases are configured with repositories pulling in an rsync security fix.
However the patch has a regression reported upstream and hence as a precaution, we want to rollback to previous known good images.
@sktomer sktomer requested a review from a team as a code owner January 15, 2025 19:55
Copy link

Diff for 8da943b:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 3faa0a4..e53327b 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -6,16 +6,16 @@ Tags: 1, 2018.03, 2018.03.0.20231218.0
 amd64-GitCommit: cfb41ad1c7624786ea10f60c15ce9c117c4da3b6
 amd64-GitFetch: refs/heads/2018.03
 
-Tags: 2, 2.0.20250113.0
+Tags: 2, 2.0.20250108.0
 Architectures: amd64, arm64v8
-amd64-GitCommit: b84556ba433d65237ffe8fb05954817fb106d75c
+amd64-GitCommit: 41d7f68f76f06dfc10f91f2fb1a66c0b409bb24a
 amd64-GitFetch: refs/heads/amzn2
-arm64v8-GitCommit: 4259593778d2933c570c7dca93babfb308a0defc
+arm64v8-GitCommit: 6d97eb936d51e8f9d7925da7869df7b5b65a0fc7
 arm64v8-GitFetch: refs/heads/amzn2-arm64
 
-Tags: 2023, latest, 2023.6.20250114.0
+Tags: 2023, latest, 2023.6.20250107.0
 Architectures: amd64, arm64v8
-amd64-GitCommit: 77426fa0c680111c20324c283e8b8e71135b4be7
+amd64-GitCommit: 74a0e4d258d1a5efeadc82395d228357a68d38a8
 amd64-GitFetch: refs/heads/al2023
-arm64v8-GitCommit: 5cad4ebd04ef9dcc0ee815a82d621d269cd25b29
+arm64v8-GitCommit: 6d37b43628844cc88916b1b8a0b239281441b546
 arm64v8-GitFetch: refs/heads/al2023-arm64
diff --git a/_bashbrew-list b/_bashbrew-list
index 0b8ccd1..8a664d1 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,8 +1,8 @@
 amazonlinux:1
 amazonlinux:2
-amazonlinux:2.0.20250113.0
+amazonlinux:2.0.20250108.0
 amazonlinux:2018.03
 amazonlinux:2018.03.0.20231218.0
 amazonlinux:2023
-amazonlinux:2023.6.20250114.0
+amazonlinux:2023.6.20250107.0
 amazonlinux:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 4a13093..06e34d1 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,3 +1,3 @@
-amazonlinux:2.0.20250113.0
+amazonlinux:2.0.20250108.0
 amazonlinux:2018.03.0.20231218.0
-amazonlinux:2023.6.20250114.0
+amazonlinux:2023.6.20250107.0
diff --git a/amazonlinux_2.0.20250113.0/.dockerignore b/amazonlinux_2.0.20250108.0/.dockerignore
similarity index 100%
rename from amazonlinux_2.0.20250113.0/.dockerignore
rename to amazonlinux_2.0.20250108.0/.dockerignore
diff --git a/amazonlinux_2.0.20250113.0/Dockerfile b/amazonlinux_2.0.20250108.0/Dockerfile
similarity index 40%
rename from amazonlinux_2.0.20250113.0/Dockerfile
rename to amazonlinux_2.0.20250108.0/Dockerfile
index f72b1b9..e8fd266 100644
--- a/amazonlinux_2.0.20250113.0/Dockerfile
+++ b/amazonlinux_2.0.20250108.0/Dockerfile
@@ -1,10 +1,10 @@
 FROM alpine:latest AS verify
 RUN apk add --no-cache curl tar xz
 
-RUN ROOTFS=$(curl -sfOJL -w "amzn2-container-raw-2.0.20250113.0-x86_64.tar.xz" "https://amazon-linux-docker-sources.s3.amazonaws.com/amzn2/2.0.20250113.0/amzn2-container-raw-2.0.20250113.0-x86_64.tar.xz") \
-  && echo 'ddc2635f41ec0cf3db502fc668f722989230f7332b2b0f6964c50bd0643f02c8  amzn2-container-raw-2.0.20250113.0-x86_64.tar.xz' >> /tmp/amzn2-container-raw-2.0.20250113.0-x86_64.tar.xz.sha256 \
-  && cat /tmp/amzn2-container-raw-2.0.20250113.0-x86_64.tar.xz.sha256 \
-  && sha256sum -c /tmp/amzn2-container-raw-2.0.20250113.0-x86_64.tar.xz.sha256 \
+RUN ROOTFS=$(curl -sfOJL -w "amzn2-container-raw-2.0.20250108.0-x86_64.tar.xz" "https://amazon-linux-docker-sources.s3.amazonaws.com/amzn2/2.0.20250108.0/amzn2-container-raw-2.0.20250108.0-x86_64.tar.xz") \
+  && echo '65e9b436bcfdde6ae71da20742a9beb28f1adf98f5fd85bdbe6c190dbea81e72  amzn2-container-raw-2.0.20250108.0-x86_64.tar.xz' >> /tmp/amzn2-container-raw-2.0.20250108.0-x86_64.tar.xz.sha256 \
+  && cat /tmp/amzn2-container-raw-2.0.20250108.0-x86_64.tar.xz.sha256 \
+  && sha256sum -c /tmp/amzn2-container-raw-2.0.20250108.0-x86_64.tar.xz.sha256 \
   && mkdir /rootfs \
   && tar -C /rootfs --extract --file "${ROOTFS}"
 
diff --git a/amazonlinux_2023.6.20250114.0/.dockerignore b/amazonlinux_2023.6.20250107.0/.dockerignore
similarity index 100%
rename from amazonlinux_2023.6.20250114.0/.dockerignore
rename to amazonlinux_2023.6.20250107.0/.dockerignore
diff --git a/amazonlinux_2023.6.20250114.0/Dockerfile b/amazonlinux_2023.6.20250107.0/Dockerfile
similarity index 41%
rename from amazonlinux_2023.6.20250114.0/Dockerfile
rename to amazonlinux_2023.6.20250107.0/Dockerfile
index 593813d..db0e31d 100644
--- a/amazonlinux_2023.6.20250114.0/Dockerfile
+++ b/amazonlinux_2023.6.20250107.0/Dockerfile
@@ -1,10 +1,10 @@
 FROM alpine:latest AS verify
 RUN apk add --no-cache curl tar xz
 
-RUN ROOTFS=$(curl -sfOJL -w "al2023-container-2023.6.20250114.0-x86_64.tar.xz" "https://amazon-linux-docker-sources.s3.amazonaws.com/al2023/2023.6.20250114.0/al2023-container-2023.6.20250114.0-x86_64.tar.xz") \
-  && echo '9e5c049ec379c8d981cb64cd14832ed209421b41b41e4496a96993a7036f6fd4  al2023-container-2023.6.20250114.0-x86_64.tar.xz' >> /tmp/al2023-container-2023.6.20250114.0-x86_64.tar.xz.sha256 \
-  && cat /tmp/al2023-container-2023.6.20250114.0-x86_64.tar.xz.sha256 \
-  && sha256sum -c /tmp/al2023-container-2023.6.20250114.0-x86_64.tar.xz.sha256 \
+RUN ROOTFS=$(curl -sfOJL -w "al2023-container-2023.6.20250107.0-x86_64.tar.xz" "https://amazon-linux-docker-sources.s3.amazonaws.com/al2023/2023.6.20250107.0/al2023-container-2023.6.20250107.0-x86_64.tar.xz") \
+  && echo '1808b5c3e10eecc160757f523317bed63ad553b5484b533f89f76bb154a4aa88  al2023-container-2023.6.20250107.0-x86_64.tar.xz' >> /tmp/al2023-container-2023.6.20250107.0-x86_64.tar.xz.sha256 \
+  && cat /tmp/al2023-container-2023.6.20250107.0-x86_64.tar.xz.sha256 \
+  && sha256sum -c /tmp/al2023-container-2023.6.20250107.0-x86_64.tar.xz.sha256 \
   && mkdir /rootfs \
   && tar -C /rootfs --extract --file "${ROOTFS}"

Relevant Maintainers:

@sktomer
Copy link
Contributor Author

sktomer commented Jan 15, 2025

@yosifkit maybe you need to click merge button as well ? :-)

@yosifkit yosifkit merged commit fae1f10 into docker-library:master Jan 15, 2025
8 checks passed
@sktomer
Copy link
Contributor Author

sktomer commented Jan 15, 2025

thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants