Skip to content

Update photon image#8020

Merged
yosifkit merged 2 commits intodocker-library:masterfrom
gerrit-photon:master
May 15, 2020
Merged

Update photon image#8020
yosifkit merged 2 commits intodocker-library:masterfrom
gerrit-photon:master

Conversation

@gerrit-photon
Copy link
Contributor

Update photon image

@github-actions
Copy link

Diff for 4696278:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 653177c..5fc6489 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -2,13 +2,13 @@ Maintainers: Fabio Rapposelli <fabio@vmware.com> (@frapposelli), Alexey Makhalov
 GitRepo: https://github.com/vmware/photon-docker-image.git
 Directory: docker
 
-Tags: 1.0, 1.0-20200424
-GitFetch: refs/heads/1.0-20200424
-GitCommit: 7f5b8dc3b62cc2c8d20149e65a4efba9e406ffc5
+Tags: 1.0, 1.0-20200515
+GitFetch: refs/heads/1.0-20200515
+GitCommit: 4b3fff6435e5889c3e4fc89af12016365676ac20
 
-Tags: 2.0, 2.0-20200424
-GitFetch: refs/heads/2.0-20200424
-GitCommit: 2750e1b68c08545e8cca639cec3ea716ef406d1d
+Tags: 2.0, 2.0-20200515
+GitFetch: refs/heads/2.0-20200515
+GitCommit: 099e5627d6a2911fc39bd4c161a15950e22de9ea
 
 Tags: 3.0, 3.0-20200424, latest
 Architectures: amd64, arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index a2811b3..503dd7f 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,7 +1,7 @@
 photon:1.0
-photon:1.0-20200424
+photon:1.0-20200515
 photon:2.0
-photon:2.0-20200424
+photon:2.0-20200515
 photon:3.0
 photon:3.0-20200424
 photon:latest
diff --git a/photon_1.0-20200424/Dockerfile b/photon_1.0-20200515/Dockerfile
similarity index 59%
rename from photon_1.0-20200424/Dockerfile
rename to photon_1.0-20200515/Dockerfile
index f226d0e..1d974a5 100644
--- a/photon_1.0-20200424/Dockerfile
+++ b/photon_1.0-20200515/Dockerfile
@@ -1,8 +1,8 @@
 FROM scratch
-ADD photon-rootfs-1.0-20cf048.tar.bz2 /
+ADD photon-rootfs-1.0-9905c1f.tar.bz2 /
 
 LABEL name="Photon OS 1.0 Base Image" \
     vendor="VMware" \
-    build-date="20200424"
+    build-date="20200515"
 
 CMD ["/bin/bash"]
diff --git a/photon_1.0-20200424/photon-rootfs-1.0-20cf048.tar.bz2 b/photon_1.0-20200515/photon-rootfs-1.0-9905c1f.tar.bz2
similarity index 78%
rename from photon_1.0-20200424/photon-rootfs-1.0-20cf048.tar.bz2
rename to photon_1.0-20200515/photon-rootfs-1.0-9905c1f.tar.bz2
index 80eb9eb..a1a0461 100644
Binary files a/photon_1.0-20200424/photon-rootfs-1.0-20cf048.tar.bz2 and b/photon_1.0-20200515/photon-rootfs-1.0-9905c1f.tar.bz2 differ
diff --git a/photon_1.0-20200424/photon-rootfs-1.0-20cf048.tar.bz2  'tar -t' b/photon_1.0-20200515/photon-rootfs-1.0-9905c1f.tar.bz2  'tar -t'
similarity index 100%
rename from photon_1.0-20200424/photon-rootfs-1.0-20cf048.tar.bz2  'tar -t'
rename to photon_1.0-20200515/photon-rootfs-1.0-9905c1f.tar.bz2  'tar -t'
diff --git a/photon_2.0-20200424/Dockerfile b/photon_2.0-20200515/Dockerfile
similarity index 59%
rename from photon_2.0-20200424/Dockerfile
rename to photon_2.0-20200515/Dockerfile
index e582709..fb78654 100644
--- a/photon_2.0-20200424/Dockerfile
+++ b/photon_2.0-20200515/Dockerfile
@@ -1,8 +1,8 @@
 FROM scratch
-ADD photon-rootfs-2.0-01c2309.tar.bz2 /
+ADD photon-rootfs-2.0-69fe582.tar.bz2 /
 
 LABEL name="Photon OS 2.0 Base Image" \
     vendor="VMware" \
-    build-date="20200424"
+    build-date="20200515"
 
 CMD ["/bin/bash"]
diff --git a/photon_2.0-20200424/photon-rootfs-2.0-01c2309.tar.bz2 b/photon_2.0-20200515/photon-rootfs-2.0-69fe582.tar.bz2
similarity index 61%
rename from photon_2.0-20200424/photon-rootfs-2.0-01c2309.tar.bz2
rename to photon_2.0-20200515/photon-rootfs-2.0-69fe582.tar.bz2
index 4a70d4a..fdd6d52 100644
Binary files a/photon_2.0-20200424/photon-rootfs-2.0-01c2309.tar.bz2 and b/photon_2.0-20200515/photon-rootfs-2.0-69fe582.tar.bz2 differ
diff --git a/photon_2.0-20200424/photon-rootfs-2.0-01c2309.tar.bz2  'tar -t' b/photon_2.0-20200515/photon-rootfs-2.0-69fe582.tar.bz2  'tar -t'
similarity index 100%
rename from photon_2.0-20200424/photon-rootfs-2.0-01c2309.tar.bz2  'tar -t'
rename to photon_2.0-20200515/photon-rootfs-2.0-69fe582.tar.bz2  'tar -t'

@yosifkit
Copy link
Member

Merging, but builds will be delayed due to Debian and PHP security fixes that have filled the build queue.

@yosifkit yosifkit merged commit d4642c3 into docker-library:master May 15, 2020
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