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

Add amazonlinux releases #18139

Closed
wants to merge 1 commit into from
Closed

Conversation

Timidger
Copy link
Contributor

Updated Packages for Amazon Linux 2023:

  • python3-libs-3.9.20-1.amzn2023.0.2
  • amazon-linux-repo-cdn-2023.6.20241212-0.amzn2023
  • system-release-2023.6.20241212-0.amzn2023
  • python3-3.9.20-1.amzn2023.0.2

Packages addressing CVES:

@Timidger Timidger requested a review from a team as a code owner December 19, 2024 19:21
Copy link

Diff for e62f85d:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index da6a8db..29ece7b 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,19 +3,19 @@ GitRepo: https://github.com/amazonlinux/container-images.git
 GitCommit: cc7a1876866f4056fa73a789a5b758358151c189
 
 Tags: 1, 2018.03, 2018.03.0.20231218.0
-amd64-GitCommit: 21ffab08ccd83dc317d0607e94ad0f9a63590a60
+amd64-GitCommit: cfb41ad1c7624786ea10f60c15ce9c117c4da3b6
 amd64-GitFetch: refs/heads/2018.03
 
 Tags: 2, 2.0.20241113.1
 Architectures: amd64, arm64v8
-amd64-GitCommit: 9345a9ec09cd77260d6000edcaa954d8cc0cd983
+amd64-GitCommit: 6e2bb5876f14f080ad1ed81b8b5fc69775f62f36
 amd64-GitFetch: refs/heads/amzn2
-arm64v8-GitCommit: d1b11d99a319c569fc7a0ab2e9c9afacf621df22
+arm64v8-GitCommit: d762c772b9f4f1706842af517c4f830cef4d2643
 arm64v8-GitFetch: refs/heads/amzn2-arm64
 
-Tags: 2023, latest, 2023.6.20241121.0
+Tags: 2023, latest, 2023.6.20241212.0
 Architectures: amd64, arm64v8
-amd64-GitCommit: 167d1c4f918992a8fb72b6f20f95b55f974e638c
+amd64-GitCommit: 57f3185c634b55eafe58bfdec5f5db20c6462032
 amd64-GitFetch: refs/heads/al2023
-arm64v8-GitCommit: 2ef88b6824fad85f32ed8479d2dddcab97ff3b8a
+arm64v8-GitCommit: 2039f9733e6d53b647da26d92cb9d6d4d59410a9
 arm64v8-GitFetch: refs/heads/al2023-arm64
diff --git a/_bashbrew-list b/_bashbrew-list
index 84b5003..f49474e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,5 +4,5 @@ amazonlinux:2.0.20241113.1
 amazonlinux:2018.03
 amazonlinux:2018.03.0.20231218.0
 amazonlinux:2023
-amazonlinux:2023.6.20241121.0
+amazonlinux:2023.6.20241212.0
 amazonlinux:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index e5b5b07..66c1406 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,3 +1,3 @@
 amazonlinux:2.0.20241113.1
 amazonlinux:2018.03.0.20231218.0
-amazonlinux:2023.6.20241121.0
+amazonlinux:2023.6.20241212.0
diff --git a/amazonlinux_2.0.20241113.1/Dockerfile b/amazonlinux_2.0.20241113.1/Dockerfile
index ff6066b..a325cd8 100644
--- a/amazonlinux_2.0.20241113.1/Dockerfile
+++ b/amazonlinux_2.0.20241113.1/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17 AS verify
+FROM alpine:latest AS verify
 RUN apk add --no-cache curl tar xz
 
 RUN ROOTFS=$(curl -sfOJL -w "amzn2-container-raw-2.0.20241113.1-x86_64.tar.xz" "https://amazon-linux-docker-sources.s3.amazonaws.com/amzn2/2.0.20241113.1/amzn2-container-raw-2.0.20241113.1-x86_64.tar.xz") \
diff --git a/amazonlinux_2018.03.0.20231218.0/Dockerfile b/amazonlinux_2018.03.0.20231218.0/Dockerfile
index 3bc9835..a78c9e8 100644
--- a/amazonlinux_2018.03.0.20231218.0/Dockerfile
+++ b/amazonlinux_2018.03.0.20231218.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.17 AS verify
+FROM alpine:latest AS verify
 RUN apk add --no-cache curl tar xz
 
 RUN ROOTFS=$(curl -sfOJL -w "amzn-container-minimal-2018.03.0.20231218.0-x86_64.tar.xz" "https://amazon-linux-docker-sources.s3.amazonaws.com/amzn/2018.03.0.20231218.0/amzn-container-minimal-2018.03.0.20231218.0-x86_64.tar.xz") \
diff --git a/amazonlinux_2023.6.20241121.0/.dockerignore b/amazonlinux_2023.6.20241212.0/.dockerignore
similarity index 100%
rename from amazonlinux_2023.6.20241121.0/.dockerignore
rename to amazonlinux_2023.6.20241212.0/.dockerignore
diff --git a/amazonlinux_2023.6.20241121.0/Dockerfile b/amazonlinux_2023.6.20241212.0/Dockerfile
similarity index 37%
rename from amazonlinux_2023.6.20241121.0/Dockerfile
rename to amazonlinux_2023.6.20241212.0/Dockerfile
index 3ec005e..8d4a62b 100644
--- a/amazonlinux_2023.6.20241121.0/Dockerfile
+++ b/amazonlinux_2023.6.20241212.0/Dockerfile
@@ -1,10 +1,10 @@
-FROM alpine:3.17 AS verify
+FROM alpine:latest AS verify
 RUN apk add --no-cache curl tar xz
 
-RUN ROOTFS=$(curl -sfOJL -w "al2023-container-2023.6.20241121.0-x86_64.tar.xz" "https://amazon-linux-docker-sources.s3.amazonaws.com/al2023/2023.6.20241121.0/al2023-container-2023.6.20241121.0-x86_64.tar.xz") \
-  && echo '87cc81147fd6c19f7bfcf67a3d6b5ef54409d36c00e31a4caaec0149a8890730  al2023-container-2023.6.20241121.0-x86_64.tar.xz' >> /tmp/al2023-container-2023.6.20241121.0-x86_64.tar.xz.sha256 \
-  && cat /tmp/al2023-container-2023.6.20241121.0-x86_64.tar.xz.sha256 \
-  && sha256sum -c /tmp/al2023-container-2023.6.20241121.0-x86_64.tar.xz.sha256 \
+RUN ROOTFS=$(curl -sfOJL -w "al2023-container-2023.6.20241212.0-x86_64.tar.xz" "https://amazon-linux-docker-sources.s3.amazonaws.com/al2023/2023.6.20241212.0/al2023-container-2023.6.20241212.0-x86_64.tar.xz") \
+  && echo '21ace35264451ddb181e144069cfb4c7435c6c549d486cdc629dcd2a3524d9d9  al2023-container-2023.6.20241212.0-x86_64.tar.xz' >> /tmp/al2023-container-2023.6.20241212.0-x86_64.tar.xz.sha256 \
+  && cat /tmp/al2023-container-2023.6.20241212.0-x86_64.tar.xz.sha256 \
+  && sha256sum -c /tmp/al2023-container-2023.6.20241212.0-x86_64.tar.xz.sha256 \
   && mkdir /rootfs \
   && tar -C /rootfs --extract --file "${ROOTFS}"

Relevant Maintainers:

@tianon
Copy link
Member

tianon commented Dec 19, 2024

Is this a duplicate of #18124? Can we merge them?

@sktomer
Copy link
Contributor

sktomer commented Dec 20, 2024

yeah we failed to coordinate leading to duplicate requests. since the other one has good comments and is mentioned in different threads, I'll close this in favor of that.

@tianon tianon closed this Dec 20, 2024
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.

3 participants