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

Merged
merged 1 commit into from
Oct 16, 2024
Merged

Update photon image #17728

merged 1 commit into from
Oct 16, 2024

Conversation

gerrit-photon
Copy link
Contributor

Update photon image

This comment has been minimized.

@michellew-vmware
Copy link

Please hold on to merge it. We have one more publish for dock image later today.

Thanks,
Michelle

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

@yosifkit
Copy link
Member

I see a more pushes today. @michellew-vmware, is this ready now?

@gerrit-photon
Copy link
Contributor Author

Hi,

We are ready to merge this PR.

Thanks,
Michelle

Copy link

Diff for f31cf20:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 4211957..eeb29e3 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-20240915
+Tags: 3.0, 3.0-20241016
 Architectures: amd64, arm64v8
-GitFetch: refs/heads/x86_64/3.0-20240915
-GitCommit: cb7a141efeed444b2e4d34ab866afef09152b946
-arm64v8-GitCommit: 697164330258b833b3ab3d215c185f097628b1eb
-arm64v8-GitFetch: refs/heads/aarch64/3.0-20240915
+GitFetch: refs/heads/x86_64/3.0-20241016
+GitCommit: 666c2ce02c167004c225287e9509d430f37e8918
+arm64v8-GitCommit: b5ab108ade15b002c9fabcabf01af5b150f32e44
+arm64v8-GitFetch: refs/heads/aarch64/3.0-20241016
 
-Tags: 4.0, 4.0-20240915
+Tags: 4.0, 4.0-20241016
 Architectures: amd64, arm64v8
-GitFetch: refs/heads/x86_64/4.0-20240915
-GitCommit: bcdf484bf3a6c43eb041311f3cc8f65d06a1ca02
-arm64v8-GitCommit: 5f66e4ec73e8d258c943e60a0537b2e0c32cbc71
-arm64v8-GitFetch: refs/heads/aarch64/4.0-20240915
+GitFetch: refs/heads/x86_64/4.0-20241016
+GitCommit: 99dbc33d9f23fa9d4bfe7c5de3a9b3a5137d8ff7
+arm64v8-GitCommit: a8fd803a3849cc05f179b06700bea90b3e642969
+arm64v8-GitFetch: refs/heads/aarch64/4.0-20241016
 
-Tags: 5.0, 5.0-20240915, latest
+Tags: 5.0, 5.0-20241016, latest
 Architectures: amd64, arm64v8
-GitFetch: refs/heads/x86_64/5.0-20240915
-GitCommit: 35db86c1a4ff081102e45e683cb90bb498010385
-arm64v8-GitCommit: 4214043f793fdc630e39f0faa9cb078c34b25c9c
-arm64v8-GitFetch: refs/heads/aarch64/5.0-20240915
+GitFetch: refs/heads/x86_64/5.0-20241016
+GitCommit: 2ff2aaada36afcfd366db0adc07b97e9ead586db
+arm64v8-GitCommit: 348917817772855bacf17c6a6eaab4ec7b7aa594
+arm64v8-GitFetch: refs/heads/aarch64/5.0-20241016
diff --git a/_bashbrew-list b/_bashbrew-list
index 601b453..05510a9 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,7 @@
 photon:3.0
-photon:3.0-20240915
+photon:3.0-20241016
 photon:4.0
-photon:4.0-20240915
+photon:4.0-20241016
 photon:5.0
-photon:5.0-20240915
+photon:5.0-20241016
 photon:latest
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 203c839..68c4eaa 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,3 +1,3 @@
-photon:3.0-20240915
-photon:4.0-20240915
+photon:3.0-20241016
+photon:4.0-20241016
 photon:latest
diff --git a/photon_3.0-20240915/Dockerfile b/photon_3.0-20241016/Dockerfile
similarity index 60%
rename from photon_3.0-20240915/Dockerfile
rename to photon_3.0-20241016/Dockerfile
index 8aa4b7b..44623a5 100644
--- a/photon_3.0-20240915/Dockerfile
+++ b/photon_3.0-20241016/Dockerfile
@@ -1,8 +1,8 @@
 FROM scratch
-ADD photon-rootfs-3.0-08ec10bb7.tar.gz /
+ADD photon-rootfs-3.0-233e550a6.tar.gz /
 
 LABEL name="Photon OS x86_64/3.0 Base Image" \
     vendor="VMware" \
-    build-date="20240915"
+    build-date="20241016"
 
 CMD ["/bin/bash"]
diff --git a/photon_3.0-20240915/photon-rootfs-3.0-08ec10bb7.tar.gz b/photon_3.0-20241016/photon-rootfs-3.0-233e550a6.tar.gz
similarity index 63%
rename from photon_3.0-20240915/photon-rootfs-3.0-08ec10bb7.tar.gz
rename to photon_3.0-20241016/photon-rootfs-3.0-233e550a6.tar.gz
index b4fc24b..4ea570a 100644
Binary files a/photon_3.0-20240915/photon-rootfs-3.0-08ec10bb7.tar.gz and b/photon_3.0-20241016/photon-rootfs-3.0-233e550a6.tar.gz differ
diff --git a/photon_3.0-20240915/photon-rootfs-3.0-08ec10bb7.tar.gz  'tar -t' b/photon_3.0-20241016/photon-rootfs-3.0-233e550a6.tar.gz  'tar -t'
similarity index 100%
rename from photon_3.0-20240915/photon-rootfs-3.0-08ec10bb7.tar.gz  'tar -t'
rename to photon_3.0-20241016/photon-rootfs-3.0-233e550a6.tar.gz  'tar -t'
diff --git a/photon_4.0-20240915/Dockerfile b/photon_4.0-20241016/Dockerfile
similarity index 60%
rename from photon_4.0-20240915/Dockerfile
rename to photon_4.0-20241016/Dockerfile
index 3854b64..54d7583 100644
--- a/photon_4.0-20240915/Dockerfile
+++ b/photon_4.0-20241016/Dockerfile
@@ -1,8 +1,8 @@
 FROM scratch
-ADD photon-rootfs-4.0-13d01d85f.tar.gz /
+ADD photon-rootfs-4.0-a4981a3c6.tar.gz /
 
 LABEL name="Photon OS x86_64/4.0 Base Image" \
     vendor="VMware" \
-    build-date="20240915"
+    build-date="20241016"
 
 CMD ["/bin/bash"]
diff --git a/photon_4.0-20240915/photon-rootfs-4.0-13d01d85f.tar.gz b/photon_4.0-20241016/photon-rootfs-4.0-a4981a3c6.tar.gz
similarity index 66%
rename from photon_4.0-20240915/photon-rootfs-4.0-13d01d85f.tar.gz
rename to photon_4.0-20241016/photon-rootfs-4.0-a4981a3c6.tar.gz
index 3d1df90..beed533 100644
Binary files a/photon_4.0-20240915/photon-rootfs-4.0-13d01d85f.tar.gz and b/photon_4.0-20241016/photon-rootfs-4.0-a4981a3c6.tar.gz differ
diff --git a/photon_4.0-20240915/photon-rootfs-4.0-13d01d85f.tar.gz  'tar -t' b/photon_4.0-20241016/photon-rootfs-4.0-a4981a3c6.tar.gz  'tar -t'
similarity index 100%
rename from photon_4.0-20240915/photon-rootfs-4.0-13d01d85f.tar.gz  'tar -t'
rename to photon_4.0-20241016/photon-rootfs-4.0-a4981a3c6.tar.gz  'tar -t'
diff --git a/photon_latest/Dockerfile b/photon_latest/Dockerfile
index 4e946b7..fc0735e 100644
--- a/photon_latest/Dockerfile
+++ b/photon_latest/Dockerfile
@@ -1,8 +1,8 @@
 FROM scratch
-ADD photon-rootfs-5.0-edfd98556.x86_64.tar.gz /
+ADD photon-rootfs-5.0-dac118894.x86_64.tar.gz /
 
 LABEL name="Photon OS x86_64/5.0 Base Image" \
     vendor="VMware" \
-    build-date="20240915"
+    build-date="20241016"
 
 CMD ["/bin/bash"]
diff --git a/photon_latest/photon-rootfs-5.0-edfd98556.x86_64.tar.gz b/photon_latest/photon-rootfs-5.0-dac118894.x86_64.tar.gz
similarity index 64%
rename from photon_latest/photon-rootfs-5.0-edfd98556.x86_64.tar.gz
rename to photon_latest/photon-rootfs-5.0-dac118894.x86_64.tar.gz
index 80e3a99..19a4a9a 100644
Binary files a/photon_latest/photon-rootfs-5.0-edfd98556.x86_64.tar.gz and b/photon_latest/photon-rootfs-5.0-dac118894.x86_64.tar.gz differ
diff --git a/photon_latest/photon-rootfs-5.0-edfd98556.x86_64.tar.gz  'tar -t' b/photon_latest/photon-rootfs-5.0-dac118894.x86_64.tar.gz  'tar -t'
similarity index 100%
rename from photon_latest/photon-rootfs-5.0-edfd98556.x86_64.tar.gz  'tar -t'
rename to photon_latest/photon-rootfs-5.0-dac118894.x86_64.tar.gz  'tar -t'

Relevant Maintainers:

@tianon tianon merged commit ccbc613 into docker-library:master Oct 16, 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.

4 participants