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

Proposed by Lucas Kanashiro
Status: Merged
Merged at revision: e3447321376e14d5f2587dd777603ee42ff1eb6a
Proposed branch: ~ubuntu-docker-images/ubuntu-docker-images/+git/mysql:manifest
Merge into: ~ubuntu-docker-images/ubuntu-docker-images/+git/mysql: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+394363@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 (6.6 KiB)

$ docker run -it ubuntu/mysql:test /bin/bash
root@52976e117b12:/# 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 ,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-20200411-0ubuntu1,gcc-10,10-20200411-0ubuntu1
ii ,gosu,1.10-1,gosu,1.10-1
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 ,libaio1:amd64,0.3.112-5,libaio,0.3.112-5
ii ,libapt-pkg6.0:amd64,2.0.2ubuntu0.1,apt,2.0.2ubuntu0.1
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 ,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 ,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 ,libedit2:amd64,3.1-20191231-1,libedit,3.1-20191231-1
ii ,libevent-core-2.1-7:amd64,2.1.11-stable-1,libevent,2.1.11-stable-1
ii ,libevent-pthreads-2.1-7:amd64,2.1.11-stable-1,libevent,2.1.11-stable-1
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-20200411-0ubuntu1,gcc-10,10-20200411-0ubuntu1
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 ,libh...

Read more...

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

LGTM. I'm just thinking that there is a discrepancy between the images: some of them are using the "&& mkdir -p ...", while others are using "; mkdir -p ...". But for now we can just keep everything as is.

review: Approve
Revision history for this message
Lucas Kanashiro (lucaskanashiro) wrote :

I agree. But for those changes I am following what we already have. When we have more time we can define a "style" on how to do things in a Dockerfile (maybe there is some linter out there that we can adopt, like pylint and rubocop but for Dockerfile).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Dockerfile b/Dockerfile
2index 7bc9e3b..c7d001d 100644
3--- a/Dockerfile
4+++ b/Dockerfile
5@@ -34,7 +34,10 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y mysql-cl
6 && rm -rf /var/lib/mysql && mkdir -p /var/lib/mysql /var/run/mysqld \
7 && chown -R mysql:mysql /var/lib/mysql /var/run/mysqld \
8 # ensure that /var/run/mysqld (used for socket and lock files) is writable regardless of the UID our mysqld instance ends up having at runtime
9- && chmod 1777 /var/run/mysqld /var/lib/mysql
10+ && chmod 1777 /var/run/mysqld /var/lib/mysql \
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 VOLUME /var/lib/mysql
16 # Config files

Subscribers

People subscribed via source and target branches

to all changes: