This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7810

packaging: update Ubuntu docker build dependencies to Python 3
ClosedPublic

Authored by sheehan on Jan 8 2020, 1:35 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb084ad4875a4: packaging: update Ubuntu docker build dependencies to Python 3
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

sheehan created this revision.Jan 8 2020, 1:35 PM
sheehan added a commit: rHGb084ad4875a4: packaging: update Ubuntu docker build dependencies to Python 3.Jan 8 2020, 3:04 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGb084ad4875a4: packaging: update Ubuntu docker build dependencies to Python 3 (authored by sheehan). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 19110

contrib/packaging/docker/ubuntu.template

FROM ubuntu:%CODENAME% FROM ubuntu:%CODENAME%
RUN groupadd -g 1000 build && \ RUN groupadd -g 1000 build && \
useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
build-essential \ build-essential \
debhelper \ debhelper \
devscripts \ devscripts \
dh-python \ dh-python \
less \ less \
python \ python \
python-all-dev \ python3-all \
python-docutils \ python3-all-dev \
python3-docutils \
unzip \ unzip \
zip zip