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

Update photon image #17994

Merged
merged 1 commit into from
Dec 2, 2024
Merged

Update photon image #17994

merged 1 commit into from
Dec 2, 2024

Conversation

gerrit-photon
Copy link
Contributor

Update photon image

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Copy link

github-actions bot commented Dec 1, 2024

Diff for f3db954:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 3f8f917..c5a6372 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -9,16 +9,16 @@ GitCommit: 03c99783ea1c9e664fc53fb18e970629a5e9495f
 arm64v8-GitCommit: c9c06473e1c89cb9d0218ffc71a456f3cfa59002
 arm64v8-GitFetch: refs/heads/aarch64/3.0-20241023
 
-Tags: 4.0, 4.0-20241110
+Tags: 4.0, 4.0-20241201
 Architectures: amd64, arm64v8
-GitFetch: refs/heads/x86_64/4.0-20241110
-GitCommit: a6f3943e0225a004b11ad2d1bdb9061bacfaa390
-arm64v8-GitCommit: 28c3e438bb1613d3ec8d2463fe5c4325cc9e4744
-arm64v8-GitFetch: refs/heads/aarch64/4.0-20241110
+GitFetch: refs/heads/x86_64/4.0-20241201
+GitCommit: ba586ebf86a3f7acbe388d6c5bc2a5b9f972cbb8
+arm64v8-GitCommit: 00f286a4ac9eb251f832caf1d65be28bed244846
+arm64v8-GitFetch: refs/heads/aarch64/4.0-20241201
 
-Tags: 5.0, 5.0-20241117, latest
+Tags: 5.0, 5.0-20241201, latest
 Architectures: amd64, arm64v8
-GitFetch: refs/heads/x86_64/5.0-20241117
-GitCommit: 31f5851cdb2d437d0f0943c4572de0b2fe34de6d
-arm64v8-GitCommit: 3006e489db482e93730f9569b6d20376684d17d6
-arm64v8-GitFetch: refs/heads/aarch64/5.0-20241117
+GitFetch: refs/heads/x86_64/5.0-20241201
+GitCommit: 0c7412e45f338f119f6593da2d56fd854b9474f2
+arm64v8-GitCommit: daef1a59f0d5434d490e8979de671459384c0291
+arm64v8-GitFetch: refs/heads/aarch64/5.0-20241201
diff --git a/_bashbrew-list b/_bashbrew-list
index 35aa0bc..5ca7fbd 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,7 @@
 photon:3.0
 photon:3.0-20241023
 photon:4.0
-photon:4.0-20241110
+photon:4.0-20241201
 photon:5.0
-photon:5.0-20241117
+photon:5.0-20241201
 photon:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index ca89f46..1715636 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,3 +1,3 @@
 photon:3.0-20241023
-photon:4.0-20241110
+photon:4.0-20241201
 photon:latest
diff --git a/photon_4.0-20241110/Dockerfile b/photon_4.0-20241201/Dockerfile
similarity index 60%
rename from photon_4.0-20241110/Dockerfile
rename to photon_4.0-20241201/Dockerfile
index df1e199..0b802b6 100644
--- a/photon_4.0-20241110/Dockerfile
+++ b/photon_4.0-20241201/Dockerfile
@@ -1,8 +1,8 @@
 FROM scratch
-ADD photon-rootfs-4.0-be24a2986.tar.gz /
+ADD photon-rootfs-4.0-9724c6526.tar.gz /
 
 LABEL name="Photon OS x86_64/4.0 Base Image" \
     vendor="VMware" \
-    build-date="20241110"
+    build-date="20241201"
 
 CMD ["/bin/bash"]
diff --git a/photon_4.0-20241110/photon-rootfs-4.0-be24a2986.tar.gz b/photon_4.0-20241201/photon-rootfs-4.0-9724c6526.tar.gz
similarity index 64%
rename from photon_4.0-20241110/photon-rootfs-4.0-be24a2986.tar.gz
rename to photon_4.0-20241201/photon-rootfs-4.0-9724c6526.tar.gz
index 8ab4301..134afd8 100644
Binary files a/photon_4.0-20241110/photon-rootfs-4.0-be24a2986.tar.gz and b/photon_4.0-20241201/photon-rootfs-4.0-9724c6526.tar.gz differ
diff --git a/photon_4.0-20241110/photon-rootfs-4.0-be24a2986.tar.gz  'tar -t' b/photon_4.0-20241201/photon-rootfs-4.0-9724c6526.tar.gz  'tar -t'
similarity index 99%
rename from photon_4.0-20241110/photon-rootfs-4.0-be24a2986.tar.gz  'tar -t'
rename to photon_4.0-20241201/photon-rootfs-4.0-9724c6526.tar.gz  'tar -t'
index 42e94a3..4ec0561 100644
--- a/photon_4.0-20241110/photon-rootfs-4.0-be24a2986.tar.gz  'tar -t'	
+++ b/photon_4.0-20241201/photon-rootfs-4.0-9724c6526.tar.gz  'tar -t'	
@@ -273,8 +273,6 @@ etc/ssl/certs/d6325660.0
 etc/ssl/certs/d6325660.pem
 etc/ssl/certs/d7e8dc79.0
 etc/ssl/certs/d7e8dc79.pem
-etc/ssl/certs/d853d49e.0
-etc/ssl/certs/d853d49e.pem
 etc/ssl/certs/dc45b0bd.0
 etc/ssl/certs/dc45b0bd.pem
 etc/ssl/certs/dc4d6a89.0
@@ -462,6 +460,7 @@ usr/bin/lua
 usr/bin/luac
 usr/bin/make-ca.sh
 usr/bin/make-cert.pl
+usr/bin/make-cert.sh
 usr/bin/makedb
 usr/bin/makedevs
 usr/bin/md5sum
diff --git a/photon_latest/Dockerfile b/photon_latest/Dockerfile
index 65c52fc..a4dfe0c 100644
--- a/photon_latest/Dockerfile
+++ b/photon_latest/Dockerfile
@@ -1,8 +1,8 @@
 FROM scratch
-ADD photon-rootfs-5.0-965ee10ac.x86_64.tar.gz /
+ADD photon-rootfs-5.0-d7b91e2d9.x86_64.tar.gz /
 
 LABEL name="Photon OS x86_64/5.0 Base Image" \
     vendor="VMware" \
-    build-date="20241117"
+    build-date="20241201"
 
 CMD ["/bin/bash"]
diff --git a/photon_latest/photon-rootfs-5.0-965ee10ac.x86_64.tar.gz b/photon_latest/photon-rootfs-5.0-d7b91e2d9.x86_64.tar.gz
similarity index 63%
rename from photon_latest/photon-rootfs-5.0-965ee10ac.x86_64.tar.gz
rename to photon_latest/photon-rootfs-5.0-d7b91e2d9.x86_64.tar.gz
index 7047334..1539b11 100644
Binary files a/photon_latest/photon-rootfs-5.0-965ee10ac.x86_64.tar.gz and b/photon_latest/photon-rootfs-5.0-d7b91e2d9.x86_64.tar.gz differ
diff --git a/photon_latest/photon-rootfs-5.0-965ee10ac.x86_64.tar.gz  'tar -t' b/photon_latest/photon-rootfs-5.0-d7b91e2d9.x86_64.tar.gz  'tar -t'
similarity index 99%
rename from photon_latest/photon-rootfs-5.0-965ee10ac.x86_64.tar.gz  'tar -t'
rename to photon_latest/photon-rootfs-5.0-d7b91e2d9.x86_64.tar.gz  'tar -t'
index d5d3e73..dbf184d 100644
--- a/photon_latest/photon-rootfs-5.0-965ee10ac.x86_64.tar.gz  'tar -t'	
+++ b/photon_latest/photon-rootfs-5.0-d7b91e2d9.x86_64.tar.gz  'tar -t'	
@@ -462,6 +462,7 @@ usr/bin/lsb_release
 usr/bin/lsusb
 usr/bin/make-ca.sh
 usr/bin/make-cert.pl
+usr/bin/make-cert.sh
 usr/bin/makedb
 usr/bin/makedevs
 usr/bin/md5sum

Relevant Maintainers:

@yosifkit yosifkit merged commit 6f57dac into docker-library:master Dec 2, 2024
8 checks passed
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