Skip to content
Snippets Groups Projects
Commit e63dfbbdbd07 authored by Sean Farley's avatar Sean Farley
Browse files

make: turn ubuntu docker into template

This allows us to easily add more ubuntu docker targets (which following
patches will do).

Also, we no longer need the mkdir command.
parent 18c1b107898e
No related branches found
No related tags found
No related merge requests found
......@@ -30,6 +30,7 @@
contrib/chg/chg
contrib/hgsh/hgsh
contrib/vagrant/.vagrant
contrib/docker/ubuntu-*
dist
packages
doc/common.txt
......
......@@ -181,8 +181,10 @@
mkdir -p packages/debian-jessie
contrib/dockerdeb debian jessie
docker-ubuntu-trusty:
mkdir -p packages/ubuntu-trusty
contrib/docker/ubuntu-%: contrib/docker/ubuntu.template
sed "s/__CODENAME__/$*/" $< > $@
docker-ubuntu-trusty: contrib/docker/ubuntu-trusty
contrib/dockerdeb ubuntu trusty
fedora20:
......
FROM ubuntu:trusty
RUN apt-get update && apt-get install -y \
build-essential \
debhelper \
dh-python \
devscripts \
python \
python-all-dev \
python-docutils \
zip \
unzip
FROM ubuntu:__CODENAME__
RUN apt-get update && apt-get install -y \
build-essential \
debhelper \
dh-python \
devscripts \
python \
python-all-dev \
python-docutils \
zip \
unzip
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment