Mercurial > hg

annotate contrib/packaging/docker/ubuntu.template @ 44036:b084ad4875a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
packaging: update Ubuntu docker build dependencies to Python 3 Changeset 7574ccd87200f02e updated the Debian docker builds to Python 3. In doing so, the Ubuntu docker-based builds broke, as the Dockerfile does not include the new dependencies as specified in `contrib/packaging/debian/control`. This commit changes the dependencies in the Ubuntu Dockerfile template to their Python 3 equivalents, fixing `make docker-ubuntu-bionic`. Differential Revision: https://phab.mercurial-scm.org/D7810
author Connor Sheehan <sheehan@mozilla.com>
date Wed, 08 Jan 2020 11:59:32 -0500
parents c8ef9d897e14
children 971424517e17
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
38459
c8ef9d897e14 packaging: don't write files for templatized Dockerfiles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 38457
diff changeset
1 FROM ubuntu:%CODENAME%
38457
11eda1f1b6e7 packaging: consistently create build user in Dockerfiles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 38003
diff changeset
2
11eda1f1b6e7 packaging: consistently create build user in Dockerfiles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 38003
diff changeset
3 RUN groupadd -g 1000 build && \
11eda1f1b6e7 packaging: consistently create build user in Dockerfiles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 38003
diff changeset
4 useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
11eda1f1b6e7 packaging: consistently create build user in Dockerfiles
Gregory Szorc <gregory.szorc@gmail.com>
parents: 38003
diff changeset
5
29031
e63dfbbdbd07 make: turn ubuntu docker into template
Sean Farley <sean@farley.io>
parents:
diff changeset
6 RUN apt-get update && apt-get install -y \
e63dfbbdbd07 make: turn ubuntu docker into template
Sean Farley <sean@farley.io>
parents:
diff changeset
7 build-essential \
e63dfbbdbd07 make: turn ubuntu docker into template
Sean Farley <sean@farley.io>
parents:
diff changeset
8 debhelper \
34423
1baa077214ae docker: try to follow the best practices for writing Dockerfiles
muxator <a.mux@inwind.it>
parents: 33023
diff changeset
9 devscripts \
29031
e63dfbbdbd07 make: turn ubuntu docker into template
Sean Farley <sean@farley.io>
parents:
diff changeset
10 dh-python \
33023
e02bae37af30 docker: install less as a build-time dependency in deb-based distros
Anton Shestakov <av6@dwimlabs.net>
parents: 29031
diff changeset
11 less \
29031
e63dfbbdbd07 make: turn ubuntu docker into template
Sean Farley <sean@farley.io>
parents:
diff changeset
12 python \
44036
b084ad4875a4 packaging: update Ubuntu docker build dependencies to Python 3
Connor Sheehan <sheehan@mozilla.com>
parents: 38459
diff changeset
13 python3-all \
b084ad4875a4 packaging: update Ubuntu docker build dependencies to Python 3
Connor Sheehan <sheehan@mozilla.com>
parents: 38459
diff changeset
14 python3-all-dev \
b084ad4875a4 packaging: update Ubuntu docker build dependencies to Python 3
Connor Sheehan <sheehan@mozilla.com>
parents: 38459
diff changeset
15 python3-docutils \
34423
1baa077214ae docker: try to follow the best practices for writing Dockerfiles
muxator <a.mux@inwind.it>
parents: 33023
diff changeset
16 unzip \
1baa077214ae docker: try to follow the best practices for writing Dockerfiles
muxator <a.mux@inwind.it>
parents: 33023
diff changeset
17 zip