Merge into edge : manifest : lp:~ubuntu-docker-images/ubuntu-docker-images/+git/apache2 : Git : Code : Ubuntu Docker Images

Status:

Merged

Merged at revision:

b2f8bc4ac0c989e9d11acf80579597cfee9feed2

Proposed branch:

~ubuntu-docker-images/ubuntu-docker-images/+git/apache2:manifest

Merge into:

~ubuntu-docker-images/ubuntu-docker-images/+git/apache2:edge

Diff against target:

16 lines (+4/-1)

1 file modified

Dockerfile (+4/-1)

High

Fix Released

Link a bug report

Reviewer	Date Requested	Status
Sergio Durigan Junior	2020-11-23	Approve on 2020-11-23
Canonical Server	2020-11-23	Pending
Review via email: mp+394362@code.launchpad.net

Description of the change

Add manifest file requested by the Security team in LP #1905052.

Revision history for this message

Lucas Kanashiro (lucaskanashiro) wrote on 2020-11-23:

#

Download full text (8.3 KiB)

$ docker run -it squeakywheel/apache2:test /bin/bash
root@51cf04790714:/# cat /usr/share/rocks/dpkg.query
# os-release
NAME="Ubuntu"
VERSION="20.04.1 LTS (Focal Fossa)"
ID=ubuntu
ID_LIKE=debian
PRETTY_NAME="Ubuntu 20.04.1 LTS"
VERSION_ID="20.04"
HOME_URL="https://www.ubuntu.com/"
SUPPORT_URL="https://help.ubuntu.com/"
BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/"
PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy"
VERSION_CODENAME=focal
UBUNTU_CODENAME=focal
# dpkg-query
ii ,adduser,3.118ubuntu2,adduser,3.118ubuntu2
ii ,apache2,2.4.41-4ubuntu3.1,apache2,2.4.41-4ubuntu3.1
ii ,apache2-bin,2.4.41-4ubuntu3.1,apache2,2.4.41-4ubuntu3.1
ii ,apache2-data,2.4.41-4ubuntu3.1,apache2,2.4.41-4ubuntu3.1
ii ,apache2-utils,2.4.41-4ubuntu3.1,apache2,2.4.41-4ubuntu3.1
ii ,apt,2.0.2ubuntu0.1,apt,2.0.2ubuntu0.1
ii ,base-files,11ubuntu5.2,base-files,11ubuntu5.2
ii ,base-passwd,3.5.47,base-passwd,3.5.47
ii ,bash,5.0-6ubuntu1.1,bash,5.0-6ubuntu1.1
ii ,bsdutils,1:2.34-0.1ubuntu9.1,util-linux,2.34-0.1ubuntu9.1
ii ,bzip2,1.0.8-2,bzip2,1.0.8-2
ii ,coreutils,8.30-3ubuntu2,coreutils,8.30-3ubuntu2
ii ,dash,0.5.10.2-6,dash,0.5.10.2-6
ii ,debconf,1.5.73,debconf,1.5.73
ii ,debianutils,4.9.1,debianutils,4.9.1
ii ,diffutils,1:3.7-3,diffutils,1:3.7-3
ii ,dpkg,1.19.7ubuntu3,dpkg,1.19.7ubuntu3
ii ,e2fsprogs,1.45.5-2ubuntu1,e2fsprogs,1.45.5-2ubuntu1
ii ,fdisk,2.34-0.1ubuntu9.1,util-linux,2.34-0.1ubuntu9.1
ii ,findutils,4.7.0-1ubuntu1,findutils,4.7.0-1ubuntu1
ii ,gcc-10-base:amd64,10.2.0-5ubuntu1~20.04,gcc-10,10.2.0-5ubuntu1~20.04
ii ,gpgv,2.2.19-3ubuntu2,gnupg2,2.2.19-3ubuntu2
ii ,grep,3.4-1,grep,3.4-1
ii ,gzip,1.10-0ubuntu4,gzip,1.10-0ubuntu4
ii ,hostname,3.23,hostname,3.23
ii ,init-system-helpers,1.57,init-system-helpers,1.57
ii ,libacl1:amd64,2.2.53-6,acl,2.2.53-6
ii ,libapr1:amd64,1.6.5-1ubuntu1,apr,1.6.5-1ubuntu1
ii ,libaprutil1:amd64,1.6.1-4ubuntu2,apr-util,1.6.1-4ubuntu2
ii ,libaprutil1-dbd-sqlite3:amd64,1.6.1-4ubuntu2,apr-util,1.6.1-4ubuntu2
ii ,libaprutil1-ldap:amd64,1.6.1-4ubuntu2,apr-util,1.6.1-4ubuntu2
ii ,libapt-pkg6.0:amd64,2.0.2ubuntu0.1,apt,2.0.2ubuntu0.1
ii ,libasn1-8-heimdal:amd64,7.7.0+dfsg-1ubuntu1,heimdal,7.7.0+dfsg-1ubuntu1
ii ,libattr1:amd64,1:2.4.48-5,attr,1:2.4.48-5
ii ,libaudit-common,1:2.8.5-2ubuntu6,audit,1:2.8.5-2ubuntu6
ii ,libaudit1:amd64,1:2.8.5-2ubuntu6,audit,1:2.8.5-2ubuntu6
ii ,libblkid1:amd64,2.34-0.1ubuntu9.1,util-linux,2.34-0.1ubuntu9.1
ii ,libbrotli1:amd64,1.0.7-6ubuntu0.1,brotli,1.0.7-6ubuntu0.1
ii ,libbz2-1.0:amd64,1.0.8-2,bzip2,1.0.8-2
ii ,libc-bin,2.31-0ubuntu9.1,glibc,2.31-0ubuntu9.1
ii ,libc6:amd64,2.31-0ubuntu9.1,glibc,2.31-0ubuntu9.1
ii ,libcap-ng0:amd64,0.7.9-2.1build1,libcap-ng,0.7.9-2.1build1
ii ,libcom-err2:amd64,1.45.5-2ubuntu1,e2fsprogs,1.45.5-2ubuntu1
ii ,libcrypt1:amd64,1:4.4.10-10ubuntu4,libxcrypt,1:4.4.10-10ubuntu4
ii ,libcurl4:amd64,7.68.0-1ubuntu2.2,curl,7.68.0-1ubuntu2.2
ii ,libdb5.3:amd64,5.3.28+dfsg1-0.6ubuntu2,db5.3,5.3.28+dfsg1-0.6ubuntu2
ii ,libdebconfclient0:amd64,0.251ubuntu1,cdebconf,0.251ubuntu1
ii ,libexpat1:amd64,2.2.9-1build1,expat,2.2.9-1build1
ii ,libext2fs2:amd64,1.45.5-2ubuntu1,e2fsprogs,1.45.5-2ubuntu1
ii ,libfdisk1:amd64,2.34-0.1ubuntu9.1,util-linux,2.34-0.1ubuntu9....

$ docker run -it squeakywheel/apache2:test /bin/bash
root@51cf04790714:/# cat /usr/share/rocks/dpkg.query 
# os-release
NAME="Ubuntu"
VERSION="20.04.1 LTS (Focal Fossa)"
ID=ubuntu
ID_LIKE=debian
PRETTY_NAME="Ubuntu 20.04.1 LTS"
VERSION_ID="20.04"
HOME_URL="https://www.ubuntu.com/"
SUPPORT_URL="https://help.ubuntu.com/"
BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/"
PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy"
VERSION_CODENAME=focal
UBUNTU_CODENAME=focal
# dpkg-query
ii ,adduser,3.118ubuntu2,adduser,3.118ubuntu2
ii ,apache2,2.4.41-4ubuntu3.1,apache2,2.4.41-4ubuntu3.1
ii ,apache2-bin,2.4.41-4ubuntu3.1,apache2,2.4.41-4ubuntu3.1
ii ,apache2-data,2.4.41-4ubuntu3.1,apache2,2.4.41-4ubuntu3.1
ii ,apache2-utils,2.4.41-4ubuntu3.1,apache2,2.4.41-4ubuntu3.1
ii ,apt,2.0.2ubuntu0.1,apt,2.0.2ubuntu0.1
ii ,base-files,11ubuntu5.2,base-files,11ubuntu5.2
ii ,base-passwd,3.5.47,base-passwd,3.5.47
ii ,bash,5.0-6ubuntu1.1,bash,5.0-6ubuntu1.1
ii ,bsdutils,1:2.34-0.1ubuntu9.1,util-linux,2.34-0.1ubuntu9.1
ii ,bzip2,1.0.8-2,bzip2,1.0.8-2
ii ,coreutils,8.30-3ubuntu2,coreutils,8.30-3ubuntu2
ii ,dash,0.5.10.2-6,dash,0.5.10.2-6
ii ,debconf,1.5.73,debconf,1.5.73
ii ,debianutils,4.9.1,debianutils,4.9.1
ii ,diffutils,1:3.7-3,diffutils,1:3.7-3
ii ,dpkg,1.19.7ubuntu3,dpkg,1.19.7ubuntu3
ii ,e2fsprogs,1.45.5-2ubuntu1,e2fsprogs,1.45.5-2ubuntu1
ii ,fdisk,2.34-0.1ubuntu9.1,util-linux,2.34-0.1ubuntu9.1
ii ,findutils,4.7.0-1ubuntu1,findutils,4.7.0-1ubuntu1
ii ,gcc-10-base:amd64,10.2.0-5ubuntu1~20.04,gcc-10,10.2.0-5ubuntu1~20.04
ii ,gpgv,2.2.19-3ubuntu2,gnupg2,2.2.19-3ubuntu2
ii ,grep,3.4-1,grep,3.4-1
ii ,gzip,1.10-0ubuntu4,gzip,1.10-0ubuntu4
ii ,hostname,3.23,hostname,3.23
ii ,init-system-helpers,1.57,init-system-helpers,1.57
ii ,libacl1:amd64,2.2.53-6,acl,2.2.53-6
ii ,libapr1:amd64,1.6.5-1ubuntu1,apr,1.6.5-1ubuntu1
ii ,libaprutil1:amd64,1.6.1-4ubuntu2,apr-util,1.6.1-4ubuntu2
ii ,libaprutil1-dbd-sqlite3:amd64,1.6.1-4ubuntu2,apr-util,1.6.1-4ubuntu2
ii ,libaprutil1-ldap:amd64,1.6.1-4ubuntu2,apr-util,1.6.1-4ubuntu2
ii ,libapt-pkg6.0:amd64,2.0.2ubuntu0.1,apt,2.0.2ubuntu0.1
ii ,libasn1-8-heimdal:amd64,7.7.0+dfsg-1ubuntu1,heimdal,7.7.0+dfsg-1ubuntu1
ii ,libattr1:amd64,1:2.4.48-5,attr,1:2.4.48-5
ii ,libaudit-common,1:2.8.5-2ubuntu6,audit,1:2.8.5-2ubuntu6
ii ,libaudit1:amd64,1:2.8.5-2ubuntu6,audit,1:2.8.5-2ubuntu6
ii ,libblkid1:amd64,2.34-0.1ubuntu9.1,util-linux,2.34-0.1ubuntu9.1
ii ,libbrotli1:amd64,1.0.7-6ubuntu0.1,brotli,1.0.7-6ubuntu0.1
ii ,libbz2-1.0:amd64,1.0.8-2,bzip2,1.0.8-2
ii ,libc-bin,2.31-0ubuntu9.1,glibc,2.31-0ubuntu9.1
ii ,libc6:amd64,2.31-0ubuntu9.1,glibc,2.31-0ubuntu9.1
ii ,libcap-ng0:amd64,0.7.9-2.1build1,libcap-ng,0.7.9-2.1build1
ii ,libcom-err2:amd64,1.45.5-2ubuntu1,e2fsprogs,1.45.5-2ubuntu1
ii ,libcrypt1:amd64,1:4.4.10-10ubuntu4,libxcrypt,1:4.4.10-10ubuntu4
ii ,libcurl4:amd64,7.68.0-1ubuntu2.2,curl,7.68.0-1ubuntu2.2
ii ,libdb5.3:amd64,5.3.28+dfsg1-0.6ubuntu2,db5.3,5.3.28+dfsg1-0.6ubuntu2
ii ,libdebconfclient0:amd64,0.251ubuntu1,cdebconf,0.251ubuntu1
ii ,libexpat1:amd64,2.2.9-1build1,expat,2.2.9-1build1
ii ,libext2fs2:amd64,1.45.5-2ubuntu1,e2fsprogs,1.45.5-2ubuntu1
ii ,libfdisk1:amd64,2.34-0.1ubuntu9.1,util-linux,2.34-0.1ubuntu9.1
ii ,libffi7:amd64,3.3-4,libffi,3.3-4
ii ,libgcc-s1:amd64,10.2.0-5ubuntu1~20.04,gcc-10,10.2.0-5ubuntu1~20.04
ii ,libgcrypt20:amd64,1.8.5-5ubuntu1,libgcrypt20,1.8.5-5ubuntu1
ii ,libgdbm-compat4:amd64,1.18.1-5,gdbm,1.18.1-5
ii ,libgdbm6:amd64,1.18.1-5,gdbm,1.18.1-5
ii ,libgmp10:amd64,2:6.2.0+dfsg-4,gmp,2:6.2.0+dfsg-4
ii ,libgnutls30:amd64,3.6.13-2ubuntu1.3,gnutls28,3.6.13-2ubuntu1.3
ii ,libgpg-error0:amd64,1.37-1,libgpg-error,1.37-1
ii ,libgssapi-krb5-2:amd64,1.17-6ubuntu4.1,krb5,1.17-6ubuntu4.1
ii ,libgssapi3-heimdal:amd64,7.7.0+dfsg-1ubuntu1,heimdal,7.7.0+dfsg-1ubuntu1
ii ,libhcrypto4-heimdal:amd64,7.7.0+dfsg-1ubuntu1,heimdal,7.7.0+dfsg-1ubuntu1
ii ,libheimbase1-heimdal:amd64,7.7.0+dfsg-1ubuntu1,heimdal,7.7.0+dfsg-1ubuntu1
ii ,libheimntlm0-heimdal:amd64,7.7.0+dfsg-1ubuntu1,heimdal,7.7.0+dfsg-1ubuntu1
ii ,libhogweed5:amd64,3.5.1+really3.5.1-2,nettle,3.5.1+really3.5.1-2
ii ,libhx509-5-heimdal:amd64,7.7.0+dfsg-1ubuntu1,heimdal,7.7.0+dfsg-1ubuntu1
ii ,libicu66:amd64,66.1-2ubuntu2,icu,66.1-2ubuntu2
ii ,libidn2-0:amd64,2.2.0-2,libidn2,2.2.0-2
ii ,libjansson4:amd64,2.12-1build1,jansson,2.12-1build1
ii ,libk5crypto3:amd64,1.17-6ubuntu4.1,krb5,1.17-6ubuntu4.1
ii ,libkeyutils1:amd64,1.6-6ubuntu1,keyutils,1.6-6ubuntu1
ii ,libkrb5-26-heimdal:amd64,7.7.0+dfsg-1ubuntu1,heimdal,7.7.0+dfsg-1ubuntu1
ii ,libkrb5-3:amd64,1.17-6ubuntu4.1,krb5,1.17-6ubuntu4.1
ii ,libkrb5support0:amd64,1.17-6ubuntu4.1,krb5,1.17-6ubuntu4.1
ii ,libldap-2.4-2:amd64,2.4.49+dfsg-2ubuntu1.5,openldap,2.4.49+dfsg-2ubuntu1.5
ii ,libldap-common,2.4.49+dfsg-2ubuntu1.5,openldap,2.4.49+dfsg-2ubuntu1.5
ii ,liblua5.2-0:amd64,5.2.4-1.1build3,lua5.2,5.2.4-1.1build3
ii ,liblz4-1:amd64,1.9.2-2,lz4,1.9.2-2
ii ,liblzma5:amd64,5.2.4-1ubuntu1,xz-utils,5.2.4-1ubuntu1
ii ,libmount1:amd64,2.34-0.1ubuntu9.1,util-linux,2.34-0.1ubuntu9.1
ii ,libncurses6:amd64,6.2-0ubuntu2,ncurses,6.2-0ubuntu2
ii ,libncursesw6:amd64,6.2-0ubuntu2,ncurses,6.2-0ubuntu2
ii ,libnettle7:amd64,3.5.1+really3.5.1-2,nettle,3.5.1+really3.5.1-2
ii ,libnghttp2-14:amd64,1.40.0-1build1,nghttp2,1.40.0-1build1
ii ,libp11-kit0:amd64,0.23.20-1build1,p11-kit,0.23.20-1build1
ii ,libpam-modules:amd64,1.3.1-5ubuntu4.1,pam,1.3.1-5ubuntu4.1
ii ,libpam-modules-bin,1.3.1-5ubuntu4.1,pam,1.3.1-5ubuntu4.1
ii ,libpam-runtime,1.3.1-5ubuntu4.1,pam,1.3.1-5ubuntu4.1
ii ,libpam0g:amd64,1.3.1-5ubuntu4.1,pam,1.3.1-5ubuntu4.1
ii ,libpcre2-8-0:amd64,10.34-7,pcre2,10.34-7
ii ,libpcre3:amd64,2:8.39-12build1,pcre3,2:8.39-12build1
ii ,libperl5.30:amd64,5.30.0-9ubuntu0.2,perl,5.30.0-9ubuntu0.2
ii ,libprocps8:amd64,2:3.3.16-1ubuntu2,procps,2:3.3.16-1ubuntu2
ii ,libpsl5:amd64,0.21.0-1ubuntu1,libpsl,0.21.0-1ubuntu1
ii ,libroken18-heimdal:amd64,7.7.0+dfsg-1ubuntu1,heimdal,7.7.0+dfsg-1ubuntu1
ii ,librtmp1:amd64,2.4+20151223.gitfa8646d.1-2build1,rtmpdump,2.4+20151223.gitfa8646d.1-2build1
ii ,libsasl2-2:amd64,2.1.27+dfsg-2,cyrus-sasl2,2.1.27+dfsg-2
ii ,libsasl2-modules-db:amd64,2.1.27+dfsg-2,cyrus-sasl2,2.1.27+dfsg-2
ii ,libseccomp2:amd64,2.4.3-1ubuntu3.20.04.3,libseccomp,2.4.3-1ubuntu3.20.04.3
ii ,libselinux1:amd64,3.0-1build2,libselinux,3.0-1build2
ii ,libsemanage-common,3.0-1build2,libsemanage,3.0-1build2
ii ,libsemanage1:amd64,3.0-1build2,libsemanage,3.0-1build2
ii ,libsepol1:amd64,3.0-1,libsepol,3.0-1
ii ,libsmartcols1:amd64,2.34-0.1ubuntu9.1,util-linux,2.34-0.1ubuntu9.1
ii ,libsqlite3-0:amd64,3.31.1-4ubuntu0.2,sqlite3,3.31.1-4ubuntu0.2
ii ,libss2:amd64,1.45.5-2ubuntu1,e2fsprogs,1.45.5-2ubuntu1
ii ,libssh-4:amd64,0.9.3-2ubuntu2.1,libssh,0.9.3-2ubuntu2.1
ii ,libssl1.1:amd64,1.1.1f-1ubuntu2,openssl,1.1.1f-1ubuntu2
ii ,libstdc++6:amd64,10.2.0-5ubuntu1~20.04,gcc-10,10.2.0-5ubuntu1~20.04
ii ,libsystemd0:amd64,245.4-4ubuntu3.3,systemd,245.4-4ubuntu3.3
ii ,libtasn1-6:amd64,4.16.0-2,libtasn1-6,4.16.0-2
ii ,libtinfo6:amd64,6.2-0ubuntu2,ncurses,6.2-0ubuntu2
ii ,libudev1:amd64,245.4-4ubuntu3.3,systemd,245.4-4ubuntu3.3
ii ,libunistring2:amd64,0.9.10-2,libunistring,0.9.10-2
ii ,libuuid1:amd64,2.34-0.1ubuntu9.1,util-linux,2.34-0.1ubuntu9.1
ii ,libwind0-heimdal:amd64,7.7.0+dfsg-1ubuntu1,heimdal,7.7.0+dfsg-1ubuntu1
ii ,libxml2:amd64,2.9.10+dfsg-5,libxml2,2.9.10+dfsg-5
ii ,libzstd1:amd64,1.4.4+dfsg-3,libzstd,1.4.4+dfsg-3
ii ,login,1:4.8.1-1ubuntu5.20.04,shadow,1:4.8.1-1ubuntu5.20.04
ii ,logsave,1.45.5-2ubuntu1,e2fsprogs,1.45.5-2ubuntu1
ii ,lsb-base,11.1.0ubuntu2,lsb,11.1.0ubuntu2
ii ,mawk,1.3.4.20200120-2,mawk,1.3.4.20200120-2
ii ,mime-support,3.64ubuntu1,mime-support,3.64ubuntu1
ii ,mount,2.34-0.1ubuntu9.1,util-linux,2.34-0.1ubuntu9.1
ii ,ncurses-base,6.2-0ubuntu2,ncurses,6.2-0ubuntu2
ii ,ncurses-bin,6.2-0ubuntu2,ncurses,6.2-0ubuntu2
ii ,passwd,1:4.8.1-1ubuntu5.20.04,shadow,1:4.8.1-1ubuntu5.20.04
ii ,perl,5.30.0-9ubuntu0.2,perl,5.30.0-9ubuntu0.2
ii ,perl-base,5.30.0-9ubuntu0.2,perl,5.30.0-9ubuntu0.2
ii ,perl-modules-5.30,5.30.0-9ubuntu0.2,perl,5.30.0-9ubuntu0.2
ii ,procps,2:3.3.16-1ubuntu2,procps,2:3.3.16-1ubuntu2
ii ,sed,4.7-1,sed,4.7-1
ii ,sensible-utils,0.0.12+nmu1,sensible-utils,0.0.12+nmu1
ii ,sysvinit-utils,2.96-2.1ubuntu1,sysvinit,2.96-2.1ubuntu1
ii ,tar,1.30+dfsg-7,tar,1.30+dfsg-7
ii ,tzdata,2020d-0ubuntu0.20.04,tzdata,2020d-0ubuntu0.20.04
ii ,ubuntu-keyring,2020.02.11.2,ubuntu-keyring,2020.02.11.2
ii ,util-linux,2.34-0.1ubuntu9.1,util-linux,2.34-0.1ubuntu9.1
ii ,zlib1g:amd64,1:1.2.11.dfsg-2ubuntu1.2,zlib,1:1.2.11.dfsg-2ubuntu1.2
root@51cf04790714:/#

Revision history for this message

Sergio Durigan Junior (sergiodj) wrote on 2020-11-23:

#

LGTM.

review: Approve

1	diff --git a/Dockerfile b/Dockerfile
2	index 344133f..8cdd1ca 100644
3	--- a/Dockerfile
4	+++ b/Dockerfile
5	@@ -226,7 +226,10 @@ RUN set -eux; \
6	&& DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y apache2 tzdata \
7	&& rm -rf /var/lib/apt/lists/* \
8	# smoke test
9	- && apache2 -v
10	+ && apache2 -v \
11	+# create manifest
12	+ && mkdir -p /usr/share/rocks \
13	+ && (echo "# os-release" && cat /etc/os-release && echo "# dpkg-query" && dpkg-query -f '${db:Status-Abbrev},${binary:Package},${Version},${source:Package},${Source:Version}\n' -W) > /usr/share/rocks/dpkg.query
14
15	# https://httpd.apache.org/docs/2.4/stopping.html#gracefulstop
16	STOPSIGNAL SIGWINCH

Ubuntu Docker Images

Merge ~ubuntu-docker-images/ubuntu-docker-images/+git/apache2:manifest into ~ubuntu-docker-images/ubuntu-docker-images/+git/apache2:edge

Commit message

Description of the change

Preview Diff

Subscribers