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

Fedora Update 2019-01-16. #5302

Merged
merged 1 commit into from
Jan 16, 2019

Conversation

cverna
Copy link
Contributor

@cverna cverna commented Jan 16, 2019

This commits add sets a default CMD to /bin/bash

Signed-off-by: Clement Verna cverna@tutanota.com

This commits add sets a default CMD to /bin/bash

Signed-off-by: Clement Verna <cverna@tutanota.com>
@tianon
Copy link
Member

tianon commented Jan 16, 2019

Diff:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 1a4ee9d..402fa9e 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -7,6 +7,7 @@ fedora:27 @ arm32v7
 fedora:27 @ arm64v8
 fedora:27 @ ppc64le
 fedora:28 @ amd64
+fedora:28 @ arm32v7
 fedora:28 @ arm64v8
 fedora:28 @ ppc64le
 fedora:28 @ s390x
diff --git a/fedora_28/Dockerfile b/fedora_28/Dockerfile
index ae630ac..f56d641 100644
--- a/fedora_28/Dockerfile
+++ b/fedora_28/Dockerfile
@@ -1,6 +1,5 @@
 FROM scratch
-MAINTAINER \
-[Adam Miller <maxamillion@fedoraproject.org>] \
-[Patrick Uiterwijk <patrick@puiterwijk.org>]
+LABEL maintainer="Clement Verna <cverna@fedoraproject.org>"
 ENV DISTTAG=f28container FGC=f28 FBR=f28
-ADD fedora-28-x86_64-20181106.tar.xz /
+ADD fedora-28-x86_64-20181130.tar.xz /
+CMD ["/bin/bash"]
diff --git a/fedora_28/fedora-28-x86_64-20181106.tar.xz b/fedora_28/fedora-28-x86_64-20181130.tar.xz
similarity index 77%
rename from fedora_28/fedora-28-x86_64-20181106.tar.xz
rename to fedora_28/fedora-28-x86_64-20181130.tar.xz
index 2a798b5..bda404c 100644
Binary files a/fedora_28/fedora-28-x86_64-20181106.tar.xz and b/fedora_28/fedora-28-x86_64-20181130.tar.xz differ
diff --git a/fedora_28/fedora-28-x86_64-20181106.tar.xz  'tar -t' b/fedora_28/fedora-28-x86_64-20181130.tar.xz  'tar -t'
similarity index 99%
rename from fedora_28/fedora-28-x86_64-20181106.tar.xz  'tar -t'
rename to fedora_28/fedora-28-x86_64-20181130.tar.xz  'tar -t'
index 2d1da52..b1d61c4 100644
--- a/fedora_28/fedora-28-x86_64-20181106.tar.xz  'tar -t'	
+++ b/fedora_28/fedora-28-x86_64-20181130.tar.xz  'tar -t'	
@@ -532,7 +532,7 @@ sbin
 srv/
 sys/
 tmp/
-tmp/ks-script-b8sk8tph
+tmp/ks-script-2jtwwfvm
 usr/
 usr/bin/
 usr/bin/[
@@ -641,9 +641,6 @@ usr/bin/fold
 usr/bin/g13
 usr/bin/gapplication
 usr/bin/gawk
-usr/bin/gdbm_dump
-usr/bin/gdbm_load
-usr/bin/gdbmtool
 usr/bin/gdbus
 usr/bin/gencat
 usr/bin/getconf
@@ -1278,7 +1275,7 @@ usr/lib64/libacl.so.1.1.2253
 usr/lib64/libanl-2.27.so
 usr/lib64/libanl.so.1
 usr/lib64/libarchive.so.13
-usr/lib64/libarchive.so.13.3.1
+usr/lib64/libarchive.so.13.3.3
 usr/lib64/libargon2.so.0
 usr/lib64/libasm-0.174.so
 usr/lib64/libasm.so.1
@@ -1345,7 +1342,7 @@ usr/lib64/libfreebl3.chk
 usr/lib64/libfreebl3.so
 usr/lib64/libfreeblpriv3.chk
 usr/lib64/libfreeblpriv3.so
-usr/lib64/libgcc_s-8-20181011.so.1
+usr/lib64/libgcc_s-8-20181105.so.1
 usr/lib64/libgcc_s.so.1
 usr/lib64/libgcrypt.so.20
 usr/lib64/libgcrypt.so.20.2.3
@@ -1434,7 +1431,7 @@ usr/lib64/libmenuw.so.6.1
 usr/lib64/libmetalink.so.3
 usr/lib64/libmetalink.so.3.1.0
 usr/lib64/libmodulemd.so.1
-usr/lib64/libmodulemd.so.1.6.4
+usr/lib64/libmodulemd.so.1.7.0
 usr/lib64/libmount.so.1
 usr/lib64/libmount.so.1.1.0
 usr/lib64/libmpfr.so.4
@@ -1544,14 +1541,14 @@ usr/lib64/libsmartcols.so.1.1.0
 usr/lib64/libsmime3.so
 usr/lib64/libsoftokn3.chk
 usr/lib64/libsoftokn3.so
-usr/lib64/libsolvext.so.0
-usr/lib64/libsolv.so.0
+usr/lib64/libsolvext.so.1
+usr/lib64/libsolv.so.1
 usr/lib64/libsqlite3.so.0
 usr/lib64/libsqlite3.so.0.8.6
 usr/lib64/libssh.so.4
-usr/lib64/libssh.so.4.7.1
+usr/lib64/libssh.so.4.7.2
 usr/lib64/libssh_threads.so.4
-usr/lib64/libssh_threads.so.4.7.1
+usr/lib64/libssh_threads.so.4.7.2
 usr/lib64/libssl3.so
 usr/lib64/libssl.so.1.1
 usr/lib64/libssl.so.1.1.0i
@@ -1593,6 +1590,8 @@ usr/lib64/libxtables.so.12
 usr/lib64/libxtables.so.12.0.0
 usr/lib64/libyaml-0.so.2
 usr/lib64/libyaml-0.so.2.0.5
+usr/lib64/libzck.so.0.9.15
+usr/lib64/libzck.so.1
 usr/lib64/libz.so.1
 usr/lib64/libz.so.1.2.11
 usr/lib64/libzstd.so.1
@@ -3065,13 +3064,13 @@ usr/lib64/python3.6/lib2to3/fixes/__pycache__/fix_zip.cpython-36.pyc
 usr/lib64/python3.6/lib2to3/fixes/__pycache__/__init__.cpython-36.opt-1.pyc
 usr/lib64/python3.6/lib2to3/fixes/__pycache__/__init__.cpython-36.opt-2.pyc
 usr/lib64/python3.6/lib2to3/fixes/__pycache__/__init__.cpython-36.pyc
-usr/lib64/python3.6/lib2to3/Grammar3.6.6.final.0.pickle
+usr/lib64/python3.6/lib2to3/Grammar3.6.7.final.0.pickle
 usr/lib64/python3.6/lib2to3/Grammar.txt
 usr/lib64/python3.6/lib2to3/__init__.py
 usr/lib64/python3.6/lib2to3/main.py
 usr/lib64/python3.6/lib2to3/__main__.py
 usr/lib64/python3.6/lib2to3/patcomp.py
-usr/lib64/python3.6/lib2to3/PatternGrammar3.6.6.final.0.pickle
+usr/lib64/python3.6/lib2to3/PatternGrammar3.6.7.final.0.pickle
 usr/lib64/python3.6/lib2to3/PatternGrammar.txt
 usr/lib64/python3.6/lib2to3/pgen2/
 usr/lib64/python3.6/lib2to3/pgen2/conv.py
@@ -4175,6 +4174,14 @@ usr/lib64/python3.6/test/support/__pycache__/
 usr/lib64/python3.6/test/support/__pycache__/__init__.cpython-36.opt-1.pyc
 usr/lib64/python3.6/test/support/__pycache__/__init__.cpython-36.opt-2.pyc
 usr/lib64/python3.6/test/support/__pycache__/__init__.cpython-36.pyc
+usr/lib64/python3.6/test/support/__pycache__/script_helper.cpython-36.opt-1.pyc
+usr/lib64/python3.6/test/support/__pycache__/script_helper.cpython-36.opt-2.pyc
+usr/lib64/python3.6/test/support/__pycache__/script_helper.cpython-36.pyc
+usr/lib64/python3.6/test/support/__pycache__/testresult.cpython-36.opt-1.pyc
+usr/lib64/python3.6/test/support/__pycache__/testresult.cpython-36.opt-2.pyc
+usr/lib64/python3.6/test/support/__pycache__/testresult.cpython-36.pyc
+usr/lib64/python3.6/test/support/script_helper.py
+usr/lib64/python3.6/test/support/testresult.py
 usr/lib64/python3.6/textwrap.py
 usr/lib64/python3.6/this.py
 usr/lib64/python3.6/_threading_local.py
@@ -7747,6 +7754,8 @@ usr/share/licenses/util-linux/COPYING.GPLv2
 usr/share/licenses/util-linux/COPYING.ISC
 usr/share/licenses/util-linux/COPYING.LGPLv2.1
 usr/share/licenses/util-linux/COPYING.UCB
+usr/share/licenses/zchunk-libs/
+usr/share/licenses/zchunk-libs/LICENSE
 usr/share/licenses/zlib/
 usr/share/licenses/zlib/README
 usr/share/locale/
diff --git a/fedora_29/Dockerfile b/fedora_29/Dockerfile
index 757d18a..3445929 100644
--- a/fedora_29/Dockerfile
+++ b/fedora_29/Dockerfile
@@ -1,6 +1,5 @@
 FROM scratch
-MAINTAINER \
-[Adam Miller <maxamillion@fedoraproject.org>] \
-[Patrick Uiterwijk <patrick@puiterwijk.org>]
+LABEL maintainer="Clement Verna <cverna@fedoraproject.org>"
 ENV DISTTAG=f29container FGC=f29 FBR=f29
-ADD fedora-29-x86_64-20190109.tar.xz /
+ADD fedora-29-x86_64-20190116.tar.xz /
+CMD ["/bin/bash"]
diff --git a/fedora_29/fedora-29-x86_64-20190109.tar.xz b/fedora_29/fedora-29-x86_64-20190116.tar.xz
similarity index 78%
rename from fedora_29/fedora-29-x86_64-20190109.tar.xz
rename to fedora_29/fedora-29-x86_64-20190116.tar.xz
index 9552369..f804a50 100644
Binary files a/fedora_29/fedora-29-x86_64-20190109.tar.xz and b/fedora_29/fedora-29-x86_64-20190116.tar.xz differ
diff --git a/fedora_29/fedora-29-x86_64-20190109.tar.xz  'tar -t' b/fedora_29/fedora-29-x86_64-20190116.tar.xz  'tar -t'
similarity index 99%
rename from fedora_29/fedora-29-x86_64-20190109.tar.xz  'tar -t'
rename to fedora_29/fedora-29-x86_64-20190116.tar.xz  'tar -t'
index 4fb3cd8..c2b3473 100644
--- a/fedora_29/fedora-29-x86_64-20190109.tar.xz  'tar -t'	
+++ b/fedora_29/fedora-29-x86_64-20190116.tar.xz  'tar -t'	
@@ -553,7 +553,7 @@ sbin
 srv/
 sys/
 tmp/
-tmp/ks-script-mn_3n7ai
+tmp/ks-script-pyau95cz
 usr/
 usr/bin/
 usr/bin/[
@@ -745,7 +745,7 @@ usr/bin/mkdir
 usr/bin/mkfifo
 usr/bin/mknod
 usr/bin/mktemp
-usr/bin/modulemd-validator
+usr/bin/modulemd-validator-v1
 usr/bin/more
 usr/bin/mount
 usr/bin/mountpoint
@@ -1277,7 +1277,7 @@ usr/lib64/libargon2.so.0
 usr/lib64/libasm-0.174.so
 usr/lib64/libasm.so.1
 usr/lib64/libassuan.so.0
-usr/lib64/libassuan.so.0.8.1
+usr/lib64/libassuan.so.0.8.2
 usr/lib64/libattr.so.1
 usr/lib64/libattr.so.1.1.2448
 usr/lib64/libaudit.so.1
@@ -1375,7 +1375,7 @@ usr/lib64/.libgnutls.so.30.hmac
 usr/lib64/libgobject-2.0.so.0
 usr/lib64/libgobject-2.0.so.0.5800.2
 usr/lib64/libgpg-error.so.0
-usr/lib64/libgpg-error.so.0.24.2
+usr/lib64/libgpg-error.so.0.25.0
 usr/lib64/libgpgme.so.11
 usr/lib64/libgpgme.so.11.20.1
 usr/lib64/libgssapi_krb5.so.2
@@ -1440,7 +1440,7 @@ usr/lib64/libmenuw.so.6.1
 usr/lib64/libmetalink.so.3
 usr/lib64/libmetalink.so.3.1.0
 usr/lib64/libmodulemd.so.1
-usr/lib64/libmodulemd.so.1.7.0
+usr/lib64/libmodulemd.so.1.8.0
 usr/lib64/libmount.so.1
 usr/lib64/libmount.so.1.1.0
 usr/lib64/libmpfr.so.4
@@ -7693,8 +7693,8 @@ usr/share/licenses/libksba/COPYING.GPLv3
 usr/share/licenses/libksba/COPYING.LGPLv3
 usr/share/licenses/libmetalink/
 usr/share/licenses/libmetalink/COPYING
-usr/share/licenses/libmodulemd/
-usr/share/licenses/libmodulemd/COPYING
+usr/share/licenses/libmodulemd1/
+usr/share/licenses/libmodulemd1/COPYING
 usr/share/licenses/libmount/
 usr/share/licenses/libmount/COPYING
 usr/share/licenses/libmount/COPYING.LGPLv2.1
diff --git a/fedora_30/Dockerfile b/fedora_30/Dockerfile
index 6c9ef97..c2de7cc 100644
--- a/fedora_30/Dockerfile
+++ b/fedora_30/Dockerfile
@@ -1,6 +1,5 @@
 FROM scratch
-MAINTAINER \
-[Adam Miller <maxamillion@fedoraproject.org>] \
-[Patrick Uiterwijk <patrick@puiterwijk.org>]
+LABEL maintainer="Clement Verna <cverna@fedoraproject.org>"
 ENV DISTTAG=f30container FGC=f30 FBR=f30
 ADD fedora-30-x86_64-20190107.tar.xz /
+CMD ["/bin/bash"]

@tianon
Copy link
Member

tianon commented Jan 16, 2019

LGTM

Build test of #5302; a93df11; amd64 (fedora):

$ bashbrew build fedora:27
Using bashbrew/cache:1fff94983f79db71e0d61239dd9e59006f7c7144dd1b22ec464f870dd8c73cb4 (fedora:27)
Tagging fedora:27

$ test/run.sh fedora:27
testing fedora:27
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build fedora:26
Using bashbrew/cache:d40a361d73fce6a69eabb26bd799b953ccaf24b5a8143f035e92be2a421653c5 (fedora:26)
Tagging fedora:26

$ test/run.sh fedora:26
testing fedora:26
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build fedora:rawhide
Building bashbrew/cache:290acb4950da3b6cb055f0f3b9cd270af3ba2bbb9745e0fec7ee10985db0c3af (fedora:rawhide)
Tagging fedora:rawhide
Tagging fedora:30

$ test/run.sh fedora:rawhide
testing fedora:rawhide
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build fedora:28
Building bashbrew/cache:e5b60f58ad69b99a43528658d5c465c463279a8be3a7a613088d5001fdc75fe8 (fedora:28)
Tagging fedora:28

$ test/run.sh fedora:28
testing fedora:28
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed


$ bashbrew build fedora:latest
Building bashbrew/cache:ba8a1af074e9f3438ff074d222e7b459076d5abeb141f4c79bd072dab25f1ea2 (fedora:latest)
Tagging fedora:latest
Tagging fedora:29

$ test/run.sh fedora:latest
testing fedora:latest
	'utc' [1/4]...passed
	'cve-2014--shellshock' [2/4]...passed
	'no-hard-coded-passwords' [3/4]...passed
	'override-cmd' [4/4]...passed

@tianon tianon merged commit 509e1a6 into docker-library:master Jan 16, 2019
@cverna cverna deleted the fedora-update-20190116 branch October 2, 2020 08:16
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