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

Merged
merged 1 commit into from
Jan 15, 2022
Merged

Update photon image #11681

merged 1 commit into from
Jan 15, 2022

Conversation

gerrit-photon
Copy link
Contributor

Update photon image

@gerrit-photon gerrit-photon force-pushed the master branch 2 times, most recently from a272fa3 to 4bea607 Compare January 14, 2022 19:56
@github-actions
Copy link

Diff for 7056629:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 81d9df6..3d44627 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -10,16 +10,16 @@ Tags: 2.0, 2.0-20220107
 GitFetch: refs/heads/2.0-20220107
 GitCommit: f954ee6e3b53d517035c7435fb0e6691bf1a2333
 
-Tags: 3.0, 3.0-20220107
+Tags: 3.0, 3.0-20220114
 Architectures: amd64, arm64v8
-GitFetch: refs/heads/x86_64/3.0-20220107
-GitCommit: d3febde90c780b56b0505109f4cacc93bcb32fac
-arm64v8-GitCommit: d6da608ab27643e082dd3daf3781eea390d7e0b1
-arm64v8-GitFetch: refs/heads/aarch64/3.0-20220107
+GitFetch: refs/heads/x86_64/3.0-20220114
+GitCommit: 95ce639d5a703bb545a3c22a208d580b58ebb6c0
+arm64v8-GitCommit: 2985ba0b3b9f0a6f9e985a5b4cb1e6f50d399026
+arm64v8-GitFetch: refs/heads/aarch64/3.0-20220114
 
-Tags: 4.0, 4.0-20220107, latest
+Tags: 4.0, 4.0-20220114, latest
 Architectures: amd64, arm64v8
-GitFetch: refs/heads/x86_64/4.0-20220107
-GitCommit: ffa11dded1848609e37c475a74f96d5932324745
-arm64v8-GitCommit: 7e7a227806fd3c862384e00188ba8a1ff357dd60
-arm64v8-GitFetch: refs/heads/aarch64/4.0-20220107
+GitFetch: refs/heads/x86_64/4.0-20220114
+GitCommit: 901f7df9aa4ff04a22eb7db77822a0b0bf901b73
+arm64v8-GitCommit: 458650fcaaf4823bc7b0dba8f4a9dc19e5cc0b76
+arm64v8-GitFetch: refs/heads/aarch64/4.0-20220114
diff --git a/_bashbrew-list b/_bashbrew-list
index a5ae841..6053021 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -3,7 +3,7 @@ photon:1.0-20211228
 photon:2.0
 photon:2.0-20220107
 photon:3.0
-photon:3.0-20220107
+photon:3.0-20220114
 photon:4.0
-photon:4.0-20220107
+photon:4.0-20220114
 photon:latest
diff --git a/photon_3.0-20220107/Dockerfile b/photon_3.0-20220114/Dockerfile
similarity index 60%
rename from photon_3.0-20220107/Dockerfile
rename to photon_3.0-20220114/Dockerfile
index ef8faf7..287c5b5 100644
--- a/photon_3.0-20220107/Dockerfile
+++ b/photon_3.0-20220114/Dockerfile
@@ -1,8 +1,8 @@
 FROM scratch
-ADD photon-rootfs-3.0-0b0ba585e.tar.gz /
+ADD photon-rootfs-3.0-2d94fe151.tar.gz /
 
 LABEL name="Photon OS x86_64/3.0 Base Image" \
     vendor="VMware" \
-    build-date="20220107"
+    build-date="20220114"
 
 CMD ["/bin/bash"]
diff --git a/photon_3.0-20220107/photon-rootfs-3.0-0b0ba585e.tar.gz b/photon_3.0-20220114/photon-rootfs-3.0-2d94fe151.tar.gz
similarity index 64%
rename from photon_3.0-20220107/photon-rootfs-3.0-0b0ba585e.tar.gz
rename to photon_3.0-20220114/photon-rootfs-3.0-2d94fe151.tar.gz
index b5eba85..bc49e19 100644
Binary files a/photon_3.0-20220107/photon-rootfs-3.0-0b0ba585e.tar.gz and b/photon_3.0-20220114/photon-rootfs-3.0-2d94fe151.tar.gz differ
diff --git a/photon_3.0-20220107/photon-rootfs-3.0-0b0ba585e.tar.gz  'tar -t' b/photon_3.0-20220114/photon-rootfs-3.0-2d94fe151.tar.gz  'tar -t'
similarity index 99%
rename from photon_3.0-20220107/photon-rootfs-3.0-0b0ba585e.tar.gz  'tar -t'
rename to photon_3.0-20220114/photon-rootfs-3.0-2d94fe151.tar.gz  'tar -t'
index 912b5df..3490009 100644
--- a/photon_3.0-20220107/photon-rootfs-3.0-0b0ba585e.tar.gz  'tar -t'	
+++ b/photon_3.0-20220114/photon-rootfs-3.0-2d94fe151.tar.gz  'tar -t'	
@@ -805,9 +805,9 @@ usr/lib/libssh2.so.1.0.1
 usr/lib/libssl.so.1.0.0
 usr/lib/libssl.so.1.0.2
 usr/lib/libtdnf.so.3
-usr/lib/libtdnf.so.3.1.4
+usr/lib/libtdnf.so.3.1.7
 usr/lib/libtdnfcli.so.3
-usr/lib/libtdnfcli.so.3.1.4
+usr/lib/libtdnfcli.so.3.1.7
 usr/lib/libthread_db-1.0.so
 usr/lib/libthread_db.so
 usr/lib/libthread_db.so.1
diff --git a/photon_latest/Dockerfile b/photon_latest/Dockerfile
index f5e85e5..26811d1 100644
--- a/photon_latest/Dockerfile
+++ b/photon_latest/Dockerfile
@@ -1,8 +1,8 @@
 FROM scratch
-ADD photon-rootfs-4.0-2e7720037.tar.gz /
+ADD photon-rootfs-4.0-a450604a2.tar.gz /
 
 LABEL name="Photon OS x86_64/4.0 Base Image" \
     vendor="VMware" \
-    build-date="20220107"
+    build-date="20220114"
 
 CMD ["/bin/bash"]
diff --git a/photon_latest/photon-rootfs-4.0-2e7720037.tar.gz b/photon_latest/photon-rootfs-4.0-a450604a2.tar.gz
similarity index 63%
rename from photon_latest/photon-rootfs-4.0-2e7720037.tar.gz
rename to photon_latest/photon-rootfs-4.0-a450604a2.tar.gz
index 90ce6ba..1b92ff3 100644
Binary files a/photon_latest/photon-rootfs-4.0-2e7720037.tar.gz and b/photon_latest/photon-rootfs-4.0-a450604a2.tar.gz differ
diff --git a/photon_latest/photon-rootfs-4.0-2e7720037.tar.gz  'tar -t' b/photon_latest/photon-rootfs-4.0-a450604a2.tar.gz  'tar -t'
similarity index 99%
rename from photon_latest/photon-rootfs-4.0-2e7720037.tar.gz  'tar -t'
rename to photon_latest/photon-rootfs-4.0-a450604a2.tar.gz  'tar -t'
index eb89b3d..1b92445 100644
--- a/photon_latest/photon-rootfs-4.0-2e7720037.tar.gz  'tar -t'	
+++ b/photon_latest/photon-rootfs-4.0-a450604a2.tar.gz  'tar -t'	
@@ -591,7 +591,9 @@ usr/bin/which
 usr/bin/who
 usr/bin/whoami
 usr/bin/xargs
-usr/bin/xmlwf
+usr/bin/xml2-config
+usr/bin/xmlcatalog
+usr/bin/xmllint
 usr/bin/xxd
 usr/bin/yat2m
 usr/bin/yes
@@ -742,8 +744,6 @@ usr/lib/libm.so.6
 usr/lib/libmemusage.so
 usr/lib/libmenuw.so.6
 usr/lib/libmenuw.so.6.2
-usr/lib/libmetalink.so.3
-usr/lib/libmetalink.so.3.1.0
 usr/lib/libmvec-2.32.so
 usr/lib/libmvec.so
 usr/lib/libmvec.so.1
@@ -803,9 +803,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.2.2
+usr/lib/libtdnf.so.3.2.3
 usr/lib/libtdnfcli.so.3
-usr/lib/libtdnfcli.so.3.2.2
+usr/lib/libtdnfcli.so.3.2.3
 usr/lib/libthread_db-1.0.so
 usr/lib/libthread_db.so
 usr/lib/libthread_db.so.1
@@ -817,6 +817,9 @@ usr/lib/libutil.so.1
 usr/lib/libverto.so
 usr/lib/libverto.so.0
 usr/lib/libverto.so.0.0
+usr/lib/libxml2.so
+usr/lib/libxml2.so.2
+usr/lib/libxml2.so.2.9.12
 usr/lib/libz.so.1
 usr/lib/libz.so.1.2.11
 usr/lib/libzstd.so.1
@@ -840,6 +843,7 @@ usr/lib/os-release
 usr/lib/ossl-modules/
 usr/lib/ossl-modules/legacy.so
 usr/lib/rpm/
+usr/lib/rpm/lock
 usr/lib/rpm/macros
 usr/lib/rpm/rpm-rebuilddb.sh
 usr/lib/rpm/rpmdb_dump
@@ -851,6 +855,7 @@ usr/lib/systemd/system/rpmdb-rebuild.service
 usr/lib/systemd/system/tdnf-cache-updateinfo.service
 usr/lib/systemd/system/tdnf-cache-updateinfo.timer
 usr/lib/terminfo
+usr/lib/xml2Conf.sh
 usr/lib64
 usr/libexec/
 usr/libexec/getconf/
@@ -943,8 +948,6 @@ usr/share/info/
 usr/share/licenses/
 usr/share/licenses/LICENSE
 usr/share/licenses/README
-usr/share/licenses/libmetalink-0.1.3/
-usr/share/licenses/libmetalink-0.1.3/LICENSE
 usr/share/locale/
 usr/share/locale/locale.alias
 usr/share/man/

Relevant Maintainers:

@yosifkit yosifkit merged commit de4230e into docker-library:master Jan 15, 2022
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