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

Merged
merged 1 commit into from
Jul 22, 2024
Merged

Update photon image #17217

merged 1 commit into from
Jul 22, 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 3f74ad2 to 7ba28fc Compare July 21, 2024 10:49

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Copy link

Diff for cea3d84:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 1d638fd..7790fe9 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-20240716
+Tags: 3.0, 3.0-20240721
 Architectures: amd64, arm64v8
-GitFetch: refs/heads/x86_64/3.0-20240716
-GitCommit: 5fb486a53f31e32f876c6c1928d23350b7e2aa61
-arm64v8-GitCommit: a2835f08b488e18ab5f43a1f4b094c8a76f87e33
-arm64v8-GitFetch: refs/heads/aarch64/3.0-20240716
+GitFetch: refs/heads/x86_64/3.0-20240721
+GitCommit: 5c01224aed1248597f2120eb1ad9111e19435262
+arm64v8-GitCommit: 5c0052004a32e9ceff37c12c4a56ce2a2b3e80fe
+arm64v8-GitFetch: refs/heads/aarch64/3.0-20240721
 
-Tags: 4.0, 4.0-20240716
+Tags: 4.0, 4.0-20240721
 Architectures: amd64, arm64v8
-GitFetch: refs/heads/x86_64/4.0-20240716
-GitCommit: 8e9fb50e381fe48ce9830250c5759f1baca3a0e7
-arm64v8-GitCommit: be4f4fafcc2d4b39d2a3929b0455917299f53c01
-arm64v8-GitFetch: refs/heads/aarch64/4.0-20240716
+GitFetch: refs/heads/x86_64/4.0-20240721
+GitCommit: 1de134c2702857a9b34e7ea8e434aa5ca62b53a0
+arm64v8-GitCommit: 21f0365332275238d44aeb2ba3e722b9aa06e3ef
+arm64v8-GitFetch: refs/heads/aarch64/4.0-20240721
 
-Tags: 5.0, 5.0-20240716, latest
+Tags: 5.0, 5.0-20240721, latest
 Architectures: amd64, arm64v8
-GitFetch: refs/heads/x86_64/5.0-20240716
-GitCommit: b9d4da7f69fe97b281915d7bd5d31d4de1634d68
-arm64v8-GitCommit: e54e89bfbc0bb6e78a94f08b9b10da7f2f9a6d7d
-arm64v8-GitFetch: refs/heads/aarch64/5.0-20240716
+GitFetch: refs/heads/x86_64/5.0-20240721
+GitCommit: 1db00f15bc3a3de31752c0c621dfec4951f555c9
+arm64v8-GitCommit: c619005bd6b730335fb974f1a957e43ae16aca24
+arm64v8-GitFetch: refs/heads/aarch64/5.0-20240721
diff --git a/_bashbrew-list b/_bashbrew-list
index 0cdc869..cce5cc1 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,7 @@
 photon:3.0
-photon:3.0-20240716
+photon:3.0-20240721
 photon:4.0
-photon:4.0-20240716
+photon:4.0-20240721
 photon:5.0
-photon:5.0-20240716
+photon:5.0-20240721
 photon:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 33f3e6f..951a6e0 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,3 +1,3 @@
-photon:3.0-20240716
-photon:4.0-20240716
+photon:3.0-20240721
+photon:4.0-20240721
 photon:latest
diff --git a/photon_3.0-20240716/Dockerfile b/photon_3.0-20240721/Dockerfile
similarity index 60%
rename from photon_3.0-20240716/Dockerfile
rename to photon_3.0-20240721/Dockerfile
index a98cbcc..41d0d59 100644
--- a/photon_3.0-20240716/Dockerfile
+++ b/photon_3.0-20240721/Dockerfile
@@ -1,8 +1,8 @@
 FROM scratch
-ADD photon-rootfs-3.0-64245f4f2.tar.gz /
+ADD photon-rootfs-3.0-7803a81ba.tar.gz /
 
 LABEL name="Photon OS x86_64/3.0 Base Image" \
     vendor="VMware" \
-    build-date="20240716"
+    build-date="20240721"
 
 CMD ["/bin/bash"]
diff --git a/photon_3.0-20240716/photon-rootfs-3.0-64245f4f2.tar.gz b/photon_3.0-20240721/photon-rootfs-3.0-7803a81ba.tar.gz
similarity index 64%
rename from photon_3.0-20240716/photon-rootfs-3.0-64245f4f2.tar.gz
rename to photon_3.0-20240721/photon-rootfs-3.0-7803a81ba.tar.gz
index e638250..f6a9b53 100644
Binary files a/photon_3.0-20240716/photon-rootfs-3.0-64245f4f2.tar.gz and b/photon_3.0-20240721/photon-rootfs-3.0-7803a81ba.tar.gz differ
diff --git a/photon_3.0-20240716/photon-rootfs-3.0-64245f4f2.tar.gz  'tar -t' b/photon_3.0-20240721/photon-rootfs-3.0-7803a81ba.tar.gz  'tar -t'
similarity index 100%
rename from photon_3.0-20240716/photon-rootfs-3.0-64245f4f2.tar.gz  'tar -t'
rename to photon_3.0-20240721/photon-rootfs-3.0-7803a81ba.tar.gz  'tar -t'
diff --git a/photon_4.0-20240716/Dockerfile b/photon_4.0-20240721/Dockerfile
similarity index 60%
rename from photon_4.0-20240716/Dockerfile
rename to photon_4.0-20240721/Dockerfile
index cf6b817..57cc243 100644
--- a/photon_4.0-20240716/Dockerfile
+++ b/photon_4.0-20240721/Dockerfile
@@ -1,8 +1,8 @@
 FROM scratch
-ADD photon-rootfs-4.0-9284cf94e.tar.gz /
+ADD photon-rootfs-4.0-5dfa47608.tar.gz /
 
 LABEL name="Photon OS x86_64/4.0 Base Image" \
     vendor="VMware" \
-    build-date="20240716"
+    build-date="20240721"
 
 CMD ["/bin/bash"]
diff --git a/photon_4.0-20240716/photon-rootfs-4.0-9284cf94e.tar.gz b/photon_4.0-20240721/photon-rootfs-4.0-5dfa47608.tar.gz
similarity index 65%
rename from photon_4.0-20240716/photon-rootfs-4.0-9284cf94e.tar.gz
rename to photon_4.0-20240721/photon-rootfs-4.0-5dfa47608.tar.gz
index 118223e..1de385f 100644
Binary files a/photon_4.0-20240716/photon-rootfs-4.0-9284cf94e.tar.gz and b/photon_4.0-20240721/photon-rootfs-4.0-5dfa47608.tar.gz differ
diff --git a/photon_4.0-20240716/photon-rootfs-4.0-9284cf94e.tar.gz  'tar -t' b/photon_4.0-20240721/photon-rootfs-4.0-5dfa47608.tar.gz  'tar -t'
similarity index 100%
rename from photon_4.0-20240716/photon-rootfs-4.0-9284cf94e.tar.gz  'tar -t'
rename to photon_4.0-20240721/photon-rootfs-4.0-5dfa47608.tar.gz  'tar -t'
diff --git a/photon_latest/Dockerfile b/photon_latest/Dockerfile
index cd8dee0..bc7afd5 100644
--- a/photon_latest/Dockerfile
+++ b/photon_latest/Dockerfile
@@ -1,8 +1,8 @@
 FROM scratch
-ADD photon-rootfs-5.0-33c815200.x86_64.tar.gz /
+ADD photon-rootfs-5.0-4744ca263.x86_64.tar.gz /
 
 LABEL name="Photon OS x86_64/5.0 Base Image" \
     vendor="VMware" \
-    build-date="20240716"
+    build-date="20240721"
 
 CMD ["/bin/bash"]
diff --git a/photon_latest/photon-rootfs-5.0-33c815200.x86_64.tar.gz b/photon_latest/photon-rootfs-5.0-4744ca263.x86_64.tar.gz
similarity index 64%
rename from photon_latest/photon-rootfs-5.0-33c815200.x86_64.tar.gz
rename to photon_latest/photon-rootfs-5.0-4744ca263.x86_64.tar.gz
index 4ef15a6..c76e040 100644
Binary files a/photon_latest/photon-rootfs-5.0-33c815200.x86_64.tar.gz and b/photon_latest/photon-rootfs-5.0-4744ca263.x86_64.tar.gz differ
diff --git a/photon_latest/photon-rootfs-5.0-33c815200.x86_64.tar.gz  'tar -t' b/photon_latest/photon-rootfs-5.0-4744ca263.x86_64.tar.gz  'tar -t'
similarity index 99%
rename from photon_latest/photon-rootfs-5.0-33c815200.x86_64.tar.gz  'tar -t'
rename to photon_latest/photon-rootfs-5.0-4744ca263.x86_64.tar.gz  'tar -t'
index a36c666..0c4e8a3 100644
--- a/photon_latest/photon-rootfs-5.0-33c815200.x86_64.tar.gz  'tar -t'	
+++ b/photon_latest/photon-rootfs-5.0-4744ca263.x86_64.tar.gz  'tar -t'	
@@ -758,9 +758,9 @@ usr/lib/libssh2.so.1
 usr/lib/libssh2.so.1.0.1
 usr/lib/libssl.so.3
 usr/lib/libtdnf.so.3
-usr/lib/libtdnf.so.3.5.7
+usr/lib/libtdnf.so.3.5.8
 usr/lib/libtdnfcli.so.3
-usr/lib/libtdnfcli.so.3.5.7
+usr/lib/libtdnfcli.so.3.5.8
 usr/lib/libthread_db.so
 usr/lib/libthread_db.so.1
 usr/lib/libtinfo.so.6

Relevant Maintainers:

@yosifkit yosifkit merged commit ff0de80 into docker-library:master Jul 22, 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.

3 participants