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

Merged
merged 5 commits into from
May 13, 2019
Merged

Update photon image #5900

merged 5 commits into from
May 13, 2019

Conversation

gerrit-photon
Copy link
Contributor

Update photon image

@yosifkit

This comment has been minimized.

@yosifkit

This comment has been minimized.

@yosifkit
Copy link
Member

Test failure is error: empty password detected for 'root' which was added in #5880.

cc @frapposelli @YustasSwamp; do you want to address the empty root password in the photon:dev image in this PR or will that be a later fix?

@YustasSwamp
Copy link
Contributor

We've fixed this issue in 1.0, 2.0 and 3.0 branches.
We are going to deprecate photon:dev tag. Update will be send shortly.
Thanks!

@michellew-vmware
Copy link

Remove dev branch from photon docker file. Please help to review it and publish it.

Thanks,
Michelle

@yosifkit
Copy link
Member

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index b190d8b..353dd39 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,6 +1,4 @@
-photon:1.0-20190503 @ amd64
-photon:2.0-20190503 @ amd64
-photon:dev-20180904 @ amd64
-photon:dev-20180904 @ arm64v8
+photon:1.0-20190510 @ amd64
+photon:2.0-20190511 @ amd64
 photon:latest @ amd64
 photon:latest @ arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index 15ebd47..57a6df2 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,9 +1,7 @@
 photon:1.0
-photon:1.0-20190503
+photon:1.0-20190510
 photon:2.0
-photon:2.0-20190503
+photon:2.0-20190511
 photon:3.0
-photon:3.0-20190430
-photon:dev
-photon:dev-20180904
+photon:3.0-20190512
 photon:latest
diff --git a/photon_1.0-20190503/Dockerfile b/photon_1.0-20190510/Dockerfile
similarity index 59%
rename from photon_1.0-20190503/Dockerfile
rename to photon_1.0-20190510/Dockerfile
index 3bbd7cd..8feaf58 100644
--- a/photon_1.0-20190503/Dockerfile
+++ b/photon_1.0-20190510/Dockerfile
@@ -1,8 +1,8 @@
 FROM scratch
-ADD photon-rootfs-1.0-44fed12.tar.bz2 /
+ADD photon-rootfs-1.0-9f10a36.tar.bz2 /
 
 LABEL name="Photon OS 1.0 Base Image" \
     vendor="VMware" \
-    build-date="20190503"
+    build-date="20190510"
 
 CMD ["/bin/bash"]
diff --git a/photon_1.0-20190503/photon-rootfs-1.0-44fed12.tar.bz2 b/photon_1.0-20190510/photon-rootfs-1.0-9f10a36.tar.bz2
similarity index 78%
rename from photon_1.0-20190503/photon-rootfs-1.0-44fed12.tar.bz2
rename to photon_1.0-20190510/photon-rootfs-1.0-9f10a36.tar.bz2
index 0cd93ba..e8d23b0 100644
Binary files a/photon_1.0-20190503/photon-rootfs-1.0-44fed12.tar.bz2 and b/photon_1.0-20190510/photon-rootfs-1.0-9f10a36.tar.bz2 differ
diff --git a/photon_1.0-20190503/photon-rootfs-1.0-44fed12.tar.bz2  'tar -t' b/photon_1.0-20190510/photon-rootfs-1.0-9f10a36.tar.bz2  'tar -t'
similarity index 100%
rename from photon_1.0-20190503/photon-rootfs-1.0-44fed12.tar.bz2  'tar -t'
rename to photon_1.0-20190510/photon-rootfs-1.0-9f10a36.tar.bz2  'tar -t'
diff --git a/photon_2.0-20190503/Dockerfile b/photon_2.0-20190511/Dockerfile
similarity index 59%
rename from photon_2.0-20190503/Dockerfile
rename to photon_2.0-20190511/Dockerfile
index 234f60c..9ee9d5c 100644
--- a/photon_2.0-20190503/Dockerfile
+++ b/photon_2.0-20190511/Dockerfile
@@ -1,8 +1,8 @@
 FROM scratch
-ADD photon-rootfs-2.0-c75c51d.tar.bz2 /
+ADD photon-rootfs-2.0-a2beadc.tar.bz2 /
 
 LABEL name="Photon OS 2.0 Base Image" \
     vendor="VMware" \
-    build-date="20190503"
+    build-date="20190511"
 
 CMD ["/bin/bash"]
diff --git a/photon_2.0-20190503/photon-rootfs-2.0-c75c51d.tar.bz2 b/photon_2.0-20190511/photon-rootfs-2.0-a2beadc.tar.bz2
similarity index 60%
rename from photon_2.0-20190503/photon-rootfs-2.0-c75c51d.tar.bz2
rename to photon_2.0-20190511/photon-rootfs-2.0-a2beadc.tar.bz2
index 33db4ad..581ddfb 100644
Binary files a/photon_2.0-20190503/photon-rootfs-2.0-c75c51d.tar.bz2 and b/photon_2.0-20190511/photon-rootfs-2.0-a2beadc.tar.bz2 differ
diff --git a/photon_2.0-20190503/photon-rootfs-2.0-c75c51d.tar.bz2  'tar -t' b/photon_2.0-20190511/photon-rootfs-2.0-a2beadc.tar.bz2  'tar -t'
similarity index 100%
rename from photon_2.0-20190503/photon-rootfs-2.0-c75c51d.tar.bz2  'tar -t'
rename to photon_2.0-20190511/photon-rootfs-2.0-a2beadc.tar.bz2  'tar -t'
diff --git a/photon_dev-20180904/Dockerfile b/photon_dev-20180904/Dockerfile
deleted file mode 100644
index f2888d8..0000000
diff --git a/photon_dev-20180904/photon-rootfs-2.0-7ca95e0.tar.bz2 b/photon_dev-20180904/photon-rootfs-2.0-7ca95e0.tar.bz2
deleted file mode 100644
index 1105a4c..0000000
diff --git a/photon_dev-20180904/photon-rootfs-2.0-7ca95e0.tar.bz2  'tar -t' b/photon_dev-20180904/photon-rootfs-2.0-7ca95e0.tar.bz2  'tar -t'
deleted file mode 100644
index 3511b4d..0000000
diff --git a/photon_latest/Dockerfile b/photon_latest/Dockerfile
index b6014f6..3a19310 100644
--- a/photon_latest/Dockerfile
+++ b/photon_latest/Dockerfile
@@ -1,8 +1,8 @@
 FROM scratch
-ADD photon-rootfs-3.0-eb41739.tar.gz /
+ADD photon-rootfs-3.0-49d932d.tar.gz /
 
 LABEL name="Photon OS x86_64/3.0 Base Image" \
     vendor="VMware" \
-    build-date="20190430"
+    build-date="20190512"
 
 CMD ["/bin/bash"]
diff --git a/photon_latest/photon-rootfs-3.0-eb41739.tar.gz b/photon_latest/photon-rootfs-3.0-49d932d.tar.gz
similarity index 62%
rename from photon_latest/photon-rootfs-3.0-eb41739.tar.gz
rename to photon_latest/photon-rootfs-3.0-49d932d.tar.gz
index 46bac9b..2f8901d 100644
Binary files a/photon_latest/photon-rootfs-3.0-eb41739.tar.gz and b/photon_latest/photon-rootfs-3.0-49d932d.tar.gz differ
diff --git a/photon_latest/photon-rootfs-3.0-eb41739.tar.gz  'tar -t' b/photon_latest/photon-rootfs-3.0-49d932d.tar.gz  'tar -t'
similarity index 100%
rename from photon_latest/photon-rootfs-3.0-eb41739.tar.gz  'tar -t'
rename to photon_latest/photon-rootfs-3.0-49d932d.tar.gz  'tar -t'

@yosifkit
Copy link
Member

Build test of #5900; d83f9c5; amd64 (photon):

$ bashbrew build photon:3.0
Using bashbrew/cache:36863a6b47bdf5acd844129976cb87b73c6f6383b0c1e70cfe04b07a2a7177ce (photon:3.0)
Tagging photon:3.0
Tagging photon:3.0-20190512
Tagging photon:latest

$ test/run.sh photon:3.0
testing photon:3.0
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...cut: /etc/shadow: No such file or directory
warning: garbage password detected for 'bin': 'x'
warning: garbage password detected for 'root': 'x'
warning: garbage password detected for 'systemd-timesync': 'x'
warning: garbage password detected for 'systemd-resolve': 'x'
warning: garbage password detected for 'systemd-network': 'x'
warning: garbage password detected for 'messagebus': 'x'
warning: garbage password detected for 'daemon': 'x'
warning: garbage password detected for 'systemd-journal-upload': 'x'
warning: garbage password detected for 'nobody': 'x'
warning: garbage password detected for 'systemd-bus-proxy': 'x'
warning: garbage password detected for 'systemd-journal-remote': 'x'
warning: garbage password detected for 'systemd-journal-gateway': 'x'
passed
	'override-cmd' [4/4]...passed


$ bashbrew build photon:1.0
Using bashbrew/cache:2c84e8d667f9b272039216a05dcc0e6df03f2a454d384d88a3efd963dd46b821 (photon:1.0)
Tagging photon:1.0
Tagging photon:1.0-20190510

$ test/run.sh photon:1.0
testing photon:1.0
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...cut: /etc/shadow: No such file or directory
warning: garbage password detected for 'bin': 'x'
warning: garbage password detected for 'root': 'x'
warning: garbage password detected for 'systemd-timesync': 'x'
warning: garbage password detected for 'systemd-resolve': 'x'
warning: garbage password detected for 'systemd-network': 'x'
warning: garbage password detected for 'messagebus': 'x'
warning: garbage password detected for 'daemon': 'x'
warning: garbage password detected for 'systemd-journal-upload': 'x'
warning: garbage password detected for 'nobody': 'x'
warning: garbage password detected for 'systemd-bus-proxy': 'x'
warning: garbage password detected for 'systemd-journal-remote': 'x'
warning: garbage password detected for 'systemd-journal-gateway': 'x'
passed
	'override-cmd' [4/4]...passed


$ bashbrew build photon:2.0
Using bashbrew/cache:c5210779e13d4eabf8e02b226718cc768490f384d0cf36c16f92fcdde2125248 (photon:2.0)
Tagging photon:2.0
Tagging photon:2.0-20190511

$ test/run.sh photon:2.0
testing photon:2.0
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...cut: /etc/shadow: No such file or directory
warning: garbage password detected for 'bin': 'x'
warning: garbage password detected for 'root': 'x'
warning: garbage password detected for 'systemd-timesync': 'x'
warning: garbage password detected for 'systemd-resolve': 'x'
warning: garbage password detected for 'systemd-network': 'x'
warning: garbage password detected for 'messagebus': 'x'
warning: garbage password detected for 'daemon': 'x'
warning: garbage password detected for 'systemd-journal-upload': 'x'
warning: garbage password detected for 'nobody': 'x'
warning: garbage password detected for 'systemd-bus-proxy': 'x'
warning: garbage password detected for 'systemd-journal-remote': 'x'
warning: garbage password detected for 'systemd-journal-gateway': 'x'
passed
	'override-cmd' [4/4]...passed

@yosifkit yosifkit merged commit 7ae3c26 into docker-library:master May 13, 2019
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.

5 participants