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 Ubuntu including first Ubuntu 20.10 Groovy Gorilla image #7951

Conversation

philroche
Copy link
Contributor

Ubuntu 20.10 Groovy Gorilla is now our devel release

Ubuntu 20.10 Groovy Gorilla is now our devel release
@github-actions
Copy link

github-actions bot commented May 6, 2020

Diff for 6dea00e:
diff --git a/_bashbrew-arches b/_bashbrew-arches
index 70ca251..6addeab 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -15,6 +15,11 @@ ubuntu:eoan @ arm64v8
 ubuntu:eoan @ i386
 ubuntu:eoan @ ppc64le
 ubuntu:eoan @ s390x
+ubuntu:rolling @ amd64
+ubuntu:rolling @ arm32v7
+ubuntu:rolling @ arm64v8
+ubuntu:rolling @ ppc64le
+ubuntu:rolling @ s390x
 ubuntu:trusty @ amd64
 ubuntu:trusty @ arm32v7
 ubuntu:trusty @ arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index 3084123..d59659c 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -3,6 +3,7 @@ ubuntu:16.04
 ubuntu:18.04
 ubuntu:19.10
 ubuntu:20.04
+ubuntu:20.10
 ubuntu:bionic
 ubuntu:bionic-20200403
 ubuntu:devel
@@ -10,6 +11,8 @@ ubuntu:eoan
 ubuntu:eoan-20200410
 ubuntu:focal
 ubuntu:focal-20200423
+ubuntu:groovy
+ubuntu:groovy-20200505
 ubuntu:latest
 ubuntu:rolling
 ubuntu:trusty
diff --git a/ubuntu_devel/Dockerfile b/ubuntu_devel/Dockerfile
index 61bac3a..aecffcd 100644
--- a/ubuntu_devel/Dockerfile
+++ b/ubuntu_devel/Dockerfile
@@ -1,5 +1,5 @@
 FROM scratch
-ADD ubuntu-focal-core-cloudimg-amd64-root.tar.gz /
+ADD ubuntu-groovy-core-cloudimg-amd64-root.tar.gz /
 # verify that the APT lists files do not exist
 RUN [ -z "$(apt-get indextargets)" ]
 # (see https://bugs.launchpad.net/cloud-images/+bug/1699913)
diff --git a/ubuntu_devel/build-info.txt b/ubuntu_devel/build-info.txt
index b2e46cb..2391733 100644
--- a/ubuntu_devel/build-info.txt
+++ b/ubuntu_devel/build-info.txt
@@ -1 +1 @@
-SERIAL=20200423
+SERIAL=20200505
diff --git a/ubuntu_devel/ubuntu-focal-core-cloudimg-amd64-root.tar.gz b/ubuntu_devel/ubuntu-groovy-core-cloudimg-amd64-root.tar.gz
similarity index 88%
copy from ubuntu_devel/ubuntu-focal-core-cloudimg-amd64-root.tar.gz
copy to ubuntu_devel/ubuntu-groovy-core-cloudimg-amd64-root.tar.gz
index 32ca6ec..138e34a 100644
Binary files a/ubuntu_devel/ubuntu-focal-core-cloudimg-amd64-root.tar.gz and b/ubuntu_devel/ubuntu-groovy-core-cloudimg-amd64-root.tar.gz differ
diff --git a/ubuntu_devel/ubuntu-focal-core-cloudimg-amd64-root.tar.gz  'tar -t' b/ubuntu_devel/ubuntu-groovy-core-cloudimg-amd64-root.tar.gz  'tar -t'
similarity index 99%
copy from ubuntu_devel/ubuntu-focal-core-cloudimg-amd64-root.tar.gz  'tar -t'
copy to ubuntu_devel/ubuntu-groovy-core-cloudimg-amd64-root.tar.gz  'tar -t'
index 01ca99c..9c09093 100644
--- a/ubuntu_devel/ubuntu-focal-core-cloudimg-amd64-root.tar.gz  'tar -t'	
+++ b/ubuntu_devel/ubuntu-groovy-core-cloudimg-amd64-root.tar.gz  'tar -t'	
@@ -942,8 +942,6 @@ usr/lib/x86_64-linux-gnu/libe2p.so.2
 usr/lib/x86_64-linux-gnu/libe2p.so.2.3
 usr/lib/x86_64-linux-gnu/libext2fs.so.2
 usr/lib/x86_64-linux-gnu/libext2fs.so.2.4
-usr/lib/x86_64-linux-gnu/libfdisk.so.1
-usr/lib/x86_64-linux-gnu/libfdisk.so.1.1.0
 usr/lib/x86_64-linux-gnu/libffi.so.7
 usr/lib/x86_64-linux-gnu/libffi.so.7.1.0
 usr/lib/x86_64-linux-gnu/libform.so.6
@@ -962,7 +960,7 @@ usr/lib/x86_64-linux-gnu/libgpg-error.so.0.28.0
 usr/lib/x86_64-linux-gnu/libhogweed.so.5
 usr/lib/x86_64-linux-gnu/libhogweed.so.5.0
 usr/lib/x86_64-linux-gnu/libidn2.so.0
-usr/lib/x86_64-linux-gnu/libidn2.so.0.3.6
+usr/lib/x86_64-linux-gnu/libidn2.so.0.3.7
 usr/lib/x86_64-linux-gnu/liblz4.so.1
 usr/lib/x86_64-linux-gnu/liblz4.so.1.9.2
 usr/lib/x86_64-linux-gnu/liblzma.so.5
@@ -1812,7 +1810,6 @@ usr/sbin/blkdiscard
 usr/sbin/blkid
 usr/sbin/blkzone
 usr/sbin/blockdev
-usr/sbin/cfdisk
 usr/sbin/chcpu
 usr/sbin/chgpasswd
 usr/sbin/chmem
@@ -1838,7 +1835,6 @@ usr/sbin/e2undo
 usr/sbin/e4crypt
 usr/sbin/e4defrag
 usr/sbin/fdformat
-usr/sbin/fdisk
 usr/sbin/filefrag
 usr/sbin/findfs
 usr/sbin/fsck
@@ -1902,7 +1898,6 @@ usr/sbin/rmt-tar
 usr/sbin/rtcwake
 usr/sbin/runuser
 usr/sbin/service
-usr/sbin/sfdisk
 usr/sbin/shadowconfig
 usr/sbin/start-stop-daemon
 usr/sbin/sulogin
@@ -1952,7 +1947,6 @@ usr/share/bash-completion/completions/blkdiscard
 usr/share/bash-completion/completions/blkid
 usr/share/bash-completion/completions/blkzone
 usr/share/bash-completion/completions/blockdev
-usr/share/bash-completion/completions/cfdisk
 usr/share/bash-completion/completions/chcpu
 usr/share/bash-completion/completions/chmem
 usr/share/bash-completion/completions/chrt
@@ -1963,7 +1957,6 @@ usr/share/bash-completion/completions/delpart
 usr/share/bash-completion/completions/dmesg
 usr/share/bash-completion/completions/fallocate
 usr/share/bash-completion/completions/fdformat
-usr/share/bash-completion/completions/fdisk
 usr/share/bash-completion/completions/fincore
 usr/share/bash-completion/completions/findfs
 usr/share/bash-completion/completions/findmnt
@@ -2018,7 +2011,6 @@ usr/share/bash-completion/completions/setarch
 usr/share/bash-completion/completions/setpriv
 usr/share/bash-completion/completions/setsid
 usr/share/bash-completion/completions/setterm
-usr/share/bash-completion/completions/sfdisk
 usr/share/bash-completion/completions/su
 usr/share/bash-completion/completions/swaplabel
 usr/share/bash-completion/completions/swapoff
@@ -2116,9 +2108,6 @@ usr/share/doc/dpkg/copyright
 usr/share/doc/e2fsprogs/
 usr/share/doc/e2fsprogs/changelog.Debian.gz
 usr/share/doc/e2fsprogs/copyright
-usr/share/doc/fdisk/
-usr/share/doc/fdisk/changelog.Debian.gz
-usr/share/doc/fdisk/copyright
 usr/share/doc/findutils/
 usr/share/doc/findutils/changelog.Debian.gz
 usr/share/doc/findutils/copyright
@@ -2181,9 +2170,6 @@ usr/share/doc/libdebconfclient0/copyright
 usr/share/doc/libext2fs2/
 usr/share/doc/libext2fs2/changelog.Debian.gz
 usr/share/doc/libext2fs2/copyright
-usr/share/doc/libfdisk1/
-usr/share/doc/libfdisk1/changelog.Debian.gz
-usr/share/doc/libfdisk1/copyright
 usr/share/doc/libffi7/
 usr/share/doc/libffi7/changelog.Debian.gz
 usr/share/doc/libffi7/copyright
@@ -2841,8 +2827,6 @@ var/lib/dpkg/info/e2fsprogs.postinst
 var/lib/dpkg/info/e2fsprogs.postrm
 var/lib/dpkg/info/e2fsprogs.preinst
 var/lib/dpkg/info/e2fsprogs.prerm
-var/lib/dpkg/info/fdisk.list
-var/lib/dpkg/info/fdisk.md5sums
 var/lib/dpkg/info/findutils.list
 var/lib/dpkg/info/findutils.md5sums
 var/lib/dpkg/info/format
@@ -2935,11 +2919,6 @@ var/lib/dpkg/info/libext2fs2:amd64.md5sums
 var/lib/dpkg/info/libext2fs2:amd64.shlibs
 var/lib/dpkg/info/libext2fs2:amd64.symbols
 var/lib/dpkg/info/libext2fs2:amd64.triggers
-var/lib/dpkg/info/libfdisk1:amd64.list
-var/lib/dpkg/info/libfdisk1:amd64.md5sums
-var/lib/dpkg/info/libfdisk1:amd64.shlibs
-var/lib/dpkg/info/libfdisk1:amd64.symbols
-var/lib/dpkg/info/libfdisk1:amd64.triggers
 var/lib/dpkg/info/libffi7:amd64.list
 var/lib/dpkg/info/libffi7:amd64.md5sums
 var/lib/dpkg/info/libffi7:amd64.shlibs
diff --git a/ubuntu_devel/ubuntu-focal-core-cloudimg-amd64.manifest b/ubuntu_devel/ubuntu-groovy-core-cloudimg-amd64.manifest
similarity index 83%
copy from ubuntu_devel/ubuntu-focal-core-cloudimg-amd64.manifest
copy to ubuntu_devel/ubuntu-groovy-core-cloudimg-amd64.manifest
index ff653f4..212f730 100644
--- a/ubuntu_devel/ubuntu-focal-core-cloudimg-amd64.manifest
+++ b/ubuntu_devel/ubuntu-groovy-core-cloudimg-amd64.manifest
@@ -1,20 +1,19 @@
 adduser	3.118ubuntu2
 apt	2.0.2
-base-files	11ubuntu5
+base-files	11ubuntu6
 base-passwd	3.5.47
 bash	5.0-6ubuntu1
 bsdutils	1:2.34-0.1ubuntu9
 bzip2	1.0.8-2
 coreutils	8.30-3ubuntu2
-dash	0.5.10.2-6
+dash	0.5.10.2-7
 debconf	1.5.73
 debianutils	4.9.1
 diffutils	1:3.7-3
 dpkg	1.19.7ubuntu3
 e2fsprogs	1.45.5-2ubuntu1
-fdisk	2.34-0.1ubuntu9
 findutils	4.7.0-1ubuntu1
-gcc-10-base:amd64	10-20200411-0ubuntu1
+gcc-10-base:amd64	10-20200425-1ubuntu2
 gpgv	2.2.19-3ubuntu2
 grep	3.4-1
 gzip	1.10-0ubuntu4
@@ -35,20 +34,19 @@ libcrypt1:amd64	1:4.4.10-10ubuntu4
 libdb5.3:amd64	5.3.28+dfsg1-0.6ubuntu2
 libdebconfclient0:amd64	0.251ubuntu1
 libext2fs2:amd64	1.45.5-2ubuntu1
-libfdisk1:amd64	2.34-0.1ubuntu9
 libffi7:amd64	3.3-4
-libgcc-s1:amd64	10-20200411-0ubuntu1
+libgcc-s1:amd64	10-20200425-1ubuntu2
 libgcrypt20:amd64	1.8.5-5ubuntu1
 libgmp10:amd64	2:6.2.0+dfsg-4
 libgnutls30:amd64	3.6.13-2ubuntu1
 libgpg-error0:amd64	1.37-1
 libhogweed5:amd64	3.5.1+really3.5.1-2
-libidn2-0:amd64	2.2.0-2
+libidn2-0:amd64	2.3.0-1
 liblz4-1:amd64	1.9.2-2
 liblzma5:amd64	5.2.4-1
 libmount1:amd64	2.34-0.1ubuntu9
-libncurses6:amd64	6.2-0ubuntu2
-libncursesw6:amd64	6.2-0ubuntu2
+libncurses6:amd64	6.2-1
+libncursesw6:amd64	6.2-1
 libnettle7:amd64	3.5.1+really3.5.1-2
 libp11-kit0:amd64	0.23.20-1build1
 libpam-modules:amd64	1.3.1-5ubuntu4
@@ -65,10 +63,10 @@ libsemanage1:amd64	3.0-1build2
 libsepol1:amd64	3.0-1
 libsmartcols1:amd64	2.34-0.1ubuntu9
 libss2:amd64	1.45.5-2ubuntu1
-libstdc++6:amd64	10-20200411-0ubuntu1
+libstdc++6:amd64	10-20200425-1ubuntu2
 libsystemd0:amd64	245.4-4ubuntu3
 libtasn1-6:amd64	4.16.0-2
-libtinfo6:amd64	6.2-0ubuntu2
+libtinfo6:amd64	6.2-1
 libudev1:amd64	245.4-4ubuntu3
 libunistring2:amd64	0.9.10-2
 libuuid1:amd64	2.34-0.1ubuntu9
@@ -78,14 +76,14 @@ logsave	1.45.5-2ubuntu1
 lsb-base	11.1.0ubuntu2
 mawk	1.3.4.20200120-2
 mount	2.34-0.1ubuntu9
-ncurses-base	6.2-0ubuntu2
-ncurses-bin	6.2-0ubuntu2
+ncurses-base	6.2-1
+ncurses-bin	6.2-1
 passwd	1:4.8.1-1ubuntu5
 perl-base	5.30.0-9build1
 procps	2:3.3.16-1ubuntu2
 sed	4.7-1
 sensible-utils	0.0.12+nmu1
-sysvinit-utils	2.96-2.1ubuntu1
+sysvinit-utils	2.96-3ubuntu1
 tar	1.30+dfsg-7
 ubuntu-keyring	2020.02.11.2
 util-linux	2.34-0.1ubuntu9
diff --git a/ubuntu_devel/Dockerfile b/ubuntu_rolling/Dockerfile
similarity index 100%
copy from ubuntu_devel/Dockerfile
copy to ubuntu_rolling/Dockerfile
diff --git a/ubuntu_devel/build-info.txt b/ubuntu_rolling/build-info.txt
similarity index 100%
copy from ubuntu_devel/build-info.txt
copy to ubuntu_rolling/build-info.txt
diff --git a/ubuntu_devel/ubuntu-focal-core-cloudimg-amd64-root.tar.gz b/ubuntu_rolling/ubuntu-focal-core-cloudimg-amd64-root.tar.gz
similarity index 100%
rename from ubuntu_devel/ubuntu-focal-core-cloudimg-amd64-root.tar.gz
rename to ubuntu_rolling/ubuntu-focal-core-cloudimg-amd64-root.tar.gz
diff --git a/ubuntu_devel/ubuntu-focal-core-cloudimg-amd64-root.tar.gz  'tar -t' b/ubuntu_rolling/ubuntu-focal-core-cloudimg-amd64-root.tar.gz  'tar -t'
similarity index 100%
rename from ubuntu_devel/ubuntu-focal-core-cloudimg-amd64-root.tar.gz  'tar -t'
rename to ubuntu_rolling/ubuntu-focal-core-cloudimg-amd64-root.tar.gz  'tar -t'
diff --git a/ubuntu_devel/ubuntu-focal-core-cloudimg-amd64.manifest b/ubuntu_rolling/ubuntu-focal-core-cloudimg-amd64.manifest
similarity index 100%
rename from ubuntu_devel/ubuntu-focal-core-cloudimg-amd64.manifest
rename to ubuntu_rolling/ubuntu-focal-core-cloudimg-amd64.manifest

Copy link
Member

@yosifkit yosifkit left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@yosifkit yosifkit merged commit 8b97d11 into docker-library:master May 6, 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