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 #17270

Merged
merged 1 commit into from
Jul 29, 2024
Merged

Update photon image #17270

merged 1 commit into from
Jul 29, 2024

Conversation

gerrit-photon
Copy link
Contributor

Update photon image

This comment has been minimized.

This comment has been minimized.

@gerrit-photon gerrit-photon force-pushed the master branch 2 times, most recently from 4fbdd12 to d57b9f9 Compare July 28, 2024 10:50

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Copy link

Diff for 145fb98:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7790fe9..7a177a9 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,23 +2,23 @@ Maintainers: Fabio Rapposelli <[email protected]> (@frapposelli), Michelle Wang <
 GitRepo: https://github.com/vmware/photon-docker-image.git
 Directory: docker
 
-Tags: 3.0, 3.0-20240721
+Tags: 3.0, 3.0-20240728
 Architectures: amd64, arm64v8
-GitFetch: refs/heads/x86_64/3.0-20240721
-GitCommit: 5c01224aed1248597f2120eb1ad9111e19435262
-arm64v8-GitCommit: 5c0052004a32e9ceff37c12c4a56ce2a2b3e80fe
-arm64v8-GitFetch: refs/heads/aarch64/3.0-20240721
+GitFetch: refs/heads/x86_64/3.0-20240728
+GitCommit: 9d074f9044a410db3e82f9c8e1ffc6fb6e80a321
+arm64v8-GitCommit: 3095c63411520426d4985f96ea65bbcc17c9bad9
+arm64v8-GitFetch: refs/heads/aarch64/3.0-20240728
 
-Tags: 4.0, 4.0-20240721
+Tags: 4.0, 4.0-20240728
 Architectures: amd64, arm64v8
-GitFetch: refs/heads/x86_64/4.0-20240721
-GitCommit: 1de134c2702857a9b34e7ea8e434aa5ca62b53a0
-arm64v8-GitCommit: 21f0365332275238d44aeb2ba3e722b9aa06e3ef
-arm64v8-GitFetch: refs/heads/aarch64/4.0-20240721
+GitFetch: refs/heads/x86_64/4.0-20240728
+GitCommit: 8c7c9c14fd4cc0a595d6db411a3f3ca478132fbc
+arm64v8-GitCommit: 2b3f0b9761baa75bd3381df3df82c26b67ceb6fa
+arm64v8-GitFetch: refs/heads/aarch64/4.0-20240728
 
-Tags: 5.0, 5.0-20240721, latest
+Tags: 5.0, 5.0-20240728, latest
 Architectures: amd64, arm64v8
-GitFetch: refs/heads/x86_64/5.0-20240721
-GitCommit: 1db00f15bc3a3de31752c0c621dfec4951f555c9
-arm64v8-GitCommit: c619005bd6b730335fb974f1a957e43ae16aca24
-arm64v8-GitFetch: refs/heads/aarch64/5.0-20240721
+GitFetch: refs/heads/x86_64/5.0-20240728
+GitCommit: 76739d93266ba4b9c23b5d584ea05f80164f3454
+arm64v8-GitCommit: 6a247c44ffb54a90784b18cdbc21090913447f80
+arm64v8-GitFetch: refs/heads/aarch64/5.0-20240728
diff --git a/_bashbrew-list b/_bashbrew-list
index cce5cc1..f414537 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,7 @@
 photon:3.0
-photon:3.0-20240721
+photon:3.0-20240728
 photon:4.0
-photon:4.0-20240721
+photon:4.0-20240728
 photon:5.0
-photon:5.0-20240721
+photon:5.0-20240728
 photon:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 951a6e0..b3d4e1b 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,3 +1,3 @@
-photon:3.0-20240721
-photon:4.0-20240721
+photon:3.0-20240728
+photon:4.0-20240728
 photon:latest
diff --git a/photon_3.0-20240721/Dockerfile b/photon_3.0-20240728/Dockerfile
similarity index 60%
rename from photon_3.0-20240721/Dockerfile
rename to photon_3.0-20240728/Dockerfile
index 41d0d59..975948b 100644
--- a/photon_3.0-20240721/Dockerfile
+++ b/photon_3.0-20240728/Dockerfile
@@ -1,8 +1,8 @@
 FROM scratch
-ADD photon-rootfs-3.0-7803a81ba.tar.gz /
+ADD photon-rootfs-3.0-ce63d42ca.tar.gz /
 
 LABEL name="Photon OS x86_64/3.0 Base Image" \
     vendor="VMware" \
-    build-date="20240721"
+    build-date="20240728"
 
 CMD ["/bin/bash"]
diff --git a/photon_3.0-20240721/photon-rootfs-3.0-7803a81ba.tar.gz b/photon_3.0-20240728/photon-rootfs-3.0-ce63d42ca.tar.gz
similarity index 64%
rename from photon_3.0-20240721/photon-rootfs-3.0-7803a81ba.tar.gz
rename to photon_3.0-20240728/photon-rootfs-3.0-ce63d42ca.tar.gz
index f6a9b53..7e69374 100644
Binary files a/photon_3.0-20240721/photon-rootfs-3.0-7803a81ba.tar.gz and b/photon_3.0-20240728/photon-rootfs-3.0-ce63d42ca.tar.gz differ
diff --git a/photon_3.0-20240721/photon-rootfs-3.0-7803a81ba.tar.gz  'tar -t' b/photon_3.0-20240728/photon-rootfs-3.0-ce63d42ca.tar.gz  'tar -t'
similarity index 100%
rename from photon_3.0-20240721/photon-rootfs-3.0-7803a81ba.tar.gz  'tar -t'
rename to photon_3.0-20240728/photon-rootfs-3.0-ce63d42ca.tar.gz  'tar -t'
diff --git a/photon_4.0-20240721/Dockerfile b/photon_4.0-20240728/Dockerfile
similarity index 60%
rename from photon_4.0-20240721/Dockerfile
rename to photon_4.0-20240728/Dockerfile
index 57cc243..afd7271 100644
--- a/photon_4.0-20240721/Dockerfile
+++ b/photon_4.0-20240728/Dockerfile
@@ -1,8 +1,8 @@
 FROM scratch
-ADD photon-rootfs-4.0-5dfa47608.tar.gz /
+ADD photon-rootfs-4.0-feb1bb20a.tar.gz /
 
 LABEL name="Photon OS x86_64/4.0 Base Image" \
     vendor="VMware" \
-    build-date="20240721"
+    build-date="20240728"
 
 CMD ["/bin/bash"]
diff --git a/photon_4.0-20240721/photon-rootfs-4.0-5dfa47608.tar.gz b/photon_4.0-20240728/photon-rootfs-4.0-feb1bb20a.tar.gz
similarity index 65%
rename from photon_4.0-20240721/photon-rootfs-4.0-5dfa47608.tar.gz
rename to photon_4.0-20240728/photon-rootfs-4.0-feb1bb20a.tar.gz
index 1de385f..90a2362 100644
Binary files a/photon_4.0-20240721/photon-rootfs-4.0-5dfa47608.tar.gz and b/photon_4.0-20240728/photon-rootfs-4.0-feb1bb20a.tar.gz differ
diff --git a/photon_4.0-20240721/photon-rootfs-4.0-5dfa47608.tar.gz  'tar -t' b/photon_4.0-20240728/photon-rootfs-4.0-feb1bb20a.tar.gz  'tar -t'
similarity index 100%
rename from photon_4.0-20240721/photon-rootfs-4.0-5dfa47608.tar.gz  'tar -t'
rename to photon_4.0-20240728/photon-rootfs-4.0-feb1bb20a.tar.gz  'tar -t'
diff --git a/photon_latest/Dockerfile b/photon_latest/Dockerfile
index bc7afd5..46701f3 100644
--- a/photon_latest/Dockerfile
+++ b/photon_latest/Dockerfile
@@ -1,8 +1,8 @@
 FROM scratch
-ADD photon-rootfs-5.0-4744ca263.x86_64.tar.gz /
+ADD photon-rootfs-5.0-8cd84e090.x86_64.tar.gz /
 
 LABEL name="Photon OS x86_64/5.0 Base Image" \
     vendor="VMware" \
-    build-date="20240721"
+    build-date="20240728"
 
 CMD ["/bin/bash"]
diff --git a/photon_latest/photon-rootfs-5.0-4744ca263.x86_64.tar.gz b/photon_latest/photon-rootfs-5.0-8cd84e090.x86_64.tar.gz
similarity index 64%
rename from photon_latest/photon-rootfs-5.0-4744ca263.x86_64.tar.gz
rename to photon_latest/photon-rootfs-5.0-8cd84e090.x86_64.tar.gz
index c76e040..759bef8 100644
Binary files a/photon_latest/photon-rootfs-5.0-4744ca263.x86_64.tar.gz and b/photon_latest/photon-rootfs-5.0-8cd84e090.x86_64.tar.gz differ
diff --git a/photon_latest/photon-rootfs-5.0-4744ca263.x86_64.tar.gz  'tar -t' b/photon_latest/photon-rootfs-5.0-8cd84e090.x86_64.tar.gz  'tar -t'
similarity index 99%
rename from photon_latest/photon-rootfs-5.0-4744ca263.x86_64.tar.gz  'tar -t'
rename to photon_latest/photon-rootfs-5.0-8cd84e090.x86_64.tar.gz  'tar -t'
index 0c4e8a3..ba25b46 100644
--- a/photon_latest/photon-rootfs-5.0-4744ca263.x86_64.tar.gz  'tar -t'	
+++ b/photon_latest/photon-rootfs-5.0-8cd84e090.x86_64.tar.gz  'tar -t'	
@@ -789,6 +789,7 @@ usr/lib/locale/en_US.UTF-8/LC_TELEPHONE
 usr/lib/locale/en_US.UTF-8/LC_TIME
 usr/lib/os-release
 usr/lib/ossl-modules/
+usr/lib/ossl-modules/jitterentropy.so
 usr/lib/ossl-modules/legacy.so
 usr/lib/rpm/
 usr/lib/rpm/macros

Relevant Maintainers:

@tianon tianon merged commit 1317bf6 into docker-library:master Jul 29, 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