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

Proposed by Lucas Kanashiro
Status: Merged
Merged at revision: 0f1626be33b508667f6b2e0868227d451d53fc50
Proposed branch: ~ubuntu-docker-images/ubuntu-docker-images/+git/nginx:manifest
Merge into: ~ubuntu-docker-images/ubuntu-docker-images/+git/nginx:edge
Diff against target: 16 lines (+4/-1)
1 file modified
Dockerfile (+4/-1)
Reviewer Review Type Date Requested Status
Sergio Durigan Junior Approve
Canonical Server Pending
Review via email: mp+394360@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :
Download full text (8.2 KiB)

Working as expected:

$ docker run -it ubuntu/nginx:test /bin/bash
root@4838751ef631:/# cat /usr/share/rocks/dpkg.query
# os-release
NAME="Ubuntu"
VERSION="20.04 LTS (Focal Fossa)"
ID=ubuntu
ID_LIKE=debian
PRETTY_NAME="Ubuntu 20.04 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 ,apt,2.0.2ubuntu0.1,apt,2.0.2ubuntu0.1
ii ,base-files,11ubuntu5,base-files,11ubuntu5
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,util-linux,2.34-0.1ubuntu9
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,util-linux,2.34-0.1ubuntu9
ii ,findutils,4.7.0-1ubuntu1,findutils,4.7.0-1ubuntu1
ii ,fontconfig-config,2.13.1-2ubuntu3,fontconfig,2.13.1-2ubuntu3
ii ,fonts-dejavu-core,2.37-1,fonts-dejavu,2.37-1
ii ,gcc-10-base:amd64,10-20200411-0ubuntu1,gcc-10,10-20200411-0ubuntu1
ii ,geoip-database,20191224-2,geoip-database,20191224-2
ii ,gettext-base,0.19.8.1-10build1,gettext,0.19.8.1-10build1
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 ,iproute2,5.5.0-1ubuntu1,iproute2,5.5.0-1ubuntu1
ii ,libacl1:amd64,2.2.53-6,acl,2.2.53-6
ii ,libapt-pkg6.0:amd64,2.0.2ubuntu0.1,apt,2.0.2ubuntu0.1
ii ,libatm1:amd64,1:2.5.1-4,linux-atm,1:2.5.1-4
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,util-linux,2.34-0.1ubuntu9
ii ,libbsd0:amd64,0.10.0-1,libbsd,0.10.0-1
ii ,libbz2-1.0:amd64,1.0.8-2,bzip2,1.0.8-2
ii ,libc-bin,2.31-0ubuntu9,glibc,2.31-0ubuntu9
ii ,libc6:amd64,2.31-0ubuntu9,glibc,2.31-0ubuntu9
ii ,libcap-ng0:amd64,0.7.9-2.1build1,libcap-ng,0.7.9-2.1build1
ii ,libcap2:amd64,1:2.32-1,libcap2,1:2.32-1
ii ,libcap2-bin,1:2.32-1,libcap2,1:2.32-1
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 ,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 ,libelf1:amd64,0.176-1.1build1,elfutils,0.176-1.1build1
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,util-linux,2.34-0.1ubuntu9
ii ,libffi7:amd64,3.3-4,libffi,3.3-4
ii ,libfontconfig1:amd64,2.13.1-2ubuntu3,fontconfig,2.13.1-2ubuntu3
ii ,libfreetype6:amd64,2.10.1-2ubuntu0.1,freetype,2.10.1-2ubuntu0.1
ii ,libgcc-s1:a...

Read more...

Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Dockerfile b/Dockerfile
2index 64994f0..8808835 100644
3--- a/Dockerfile
4+++ b/Dockerfile
5@@ -10,7 +10,10 @@ RUN set -x \
6 && apt-get install -y nginx-full gettext-base tzdata \
7 && apt-get remove --purge --auto-remove -y && rm -rf /var/lib/apt/lists/* \
8 # create a docker-entrypoint.d directory
9- && mkdir /docker-entrypoint.d
10+ && mkdir /docker-entrypoint.d \
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 COPY docker-entrypoint.sh /
16 COPY 20-envsubst-on-templates.sh /docker-entrypoint.d

Subscribers

People subscribed via source and target branches

to all changes: