facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-06 14:58:03 +03:00
Code Issues Projects Releases Wiki Activity

make: turn ubuntu docker into template

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

Also, we no longer need the mkdir command.
This commit is contained in:
Sean Farley 2016-04-26 23:33:17 -07:00
parent bf3cdfa44b
commit bf3866fc9f
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgignore
View File

@ -30,6 +30,7 @@ build
contrib/chg/chg
contrib/hgsh/hgsh
contrib/vagrant/.vagrant
contrib/docker/ubuntu-*
dist
packages
doc/common.txt

6
Makefile
View File

@ -181,8 +181,10 @@ docker-debian-jessie:
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:

2
contrib/docker/ubuntu-trusty → contrib/docker/ubuntu.template
View File

@ -1,4 +1,4 @@
FROM ubuntu:trusty
FROM ubuntu:__CODENAME__
RUN apt-get update && apt-get install -y \
build-essential \
debhelper \