Show More
| @@ -31,8 +31,6 build | |||
|
|
31 | 31 | contrib/chg/chg |
|
|
32 | 32 | contrib/hgsh/hgsh |
|
|
33 | 33 | contrib/vagrant/.vagrant |
|
|
34 | contrib/packaging/docker/debian-* | |
|
|
35 | contrib/packaging/docker/ubuntu-* | |
|
|
36 | 34 | dist |
|
|
37 | 35 | packages |
|
|
38 | 36 | doc/common.txt |
| @@ -47,50 +47,44 deb: | |||
|
|
47 | 47 | ppa: |
|
|
48 | 48 | ./builddeb --source-only |
|
|
49 | 49 | |
|
|
50 | docker/debian-%: docker/debian.template | |
|
|
51 | sed "s/__CODENAME__/$*/" $< > $@ | |
|
|
52 | ||
|
|
53 | 50 | .PHONY: docker-debian-jessie |
|
|
54 |
docker-debian-jessie: |
|
|
|
51 | docker-debian-jessie: | |
|
|
55 | 52 | ./dockerdeb debian jessie |
|
|
56 | 53 | |
|
|
57 | 54 | .PHONY: docker-debian-stretch |
|
|
58 |
docker-debian-stretch: |
|
|
|
55 | docker-debian-stretch: | |
|
|
59 | 56 | ./dockerdeb debian stretch |
|
|
60 | 57 | |
|
|
61 | docker/ubuntu-%: docker/ubuntu.template | |
|
|
62 | sed "s/__CODENAME__/$*/" $< > $@ | |
|
|
63 | ||
|
|
64 | 58 | .PHONY: docker-ubuntu-trusty |
|
|
65 |
docker-ubuntu-trusty: |
|
|
|
59 | docker-ubuntu-trusty: | |
|
|
66 | 60 | ./dockerdeb ubuntu trusty |
|
|
67 | 61 | |
|
|
68 | 62 | .PHONY: docker-ubuntu-trusty-ppa |
|
|
69 |
docker-ubuntu-trusty-ppa: |
|
|
|
63 | docker-ubuntu-trusty-ppa: | |
|
|
70 | 64 | ./dockerdeb ubuntu trusty --source-only |
|
|
71 | 65 | |
|
|
72 | 66 | .PHONY: docker-ubuntu-xenial |
|
|
73 |
docker-ubuntu-xenial: |
|
|
|
67 | docker-ubuntu-xenial: | |
|
|
74 | 68 | ./dockerdeb ubuntu xenial |
|
|
75 | 69 | |
|
|
76 | 70 | .PHONY: docker-ubuntu-xenial-ppa |
|
|
77 |
docker-ubuntu-xenial-ppa: |
|
|
|
71 | docker-ubuntu-xenial-ppa: | |
|
|
78 | 72 | ./dockerdeb ubuntu xenial --source-only |
|
|
79 | 73 | |
|
|
80 | 74 | .PHONY: docker-ubuntu-artful |
|
|
81 |
docker-ubuntu-artful: |
|
|
|
75 | docker-ubuntu-artful: | |
|
|
82 | 76 | ./dockerdeb ubuntu artful |
|
|
83 | 77 | |
|
|
84 | 78 | .PHONY: docker-ubuntu-artful-ppa |
|
|
85 |
docker-ubuntu-artful-ppa: |
|
|
|
79 | docker-ubuntu-artful-ppa: | |
|
|
86 | 80 | ./dockerdeb ubuntu artful --source-only |
|
|
87 | 81 | |
|
|
88 | 82 | .PHONY: docker-ubuntu-bionic |
|
|
89 |
docker-ubuntu-bionic: |
|
|
|
83 | docker-ubuntu-bionic: | |
|
|
90 | 84 | ./dockerdeb ubuntu bionic |
|
|
91 | 85 | |
|
|
92 | 86 | .PHONY: docker-ubuntu-bionic-ppa |
|
|
93 |
docker-ubuntu-bionic-ppa: |
|
|
|
87 | docker-ubuntu-bionic-ppa: | |
|
|
94 | 88 | ./dockerdeb ubuntu bionic --source-only |
|
|
95 | 89 | |
|
|
96 | 90 | .PHONY: fedora20 |
| @@ -1,4 +1,4 | |||
|
|
1 |
FROM debian: |
|
|
|
1 | FROM debian:%CODENAME% | |
|
|
2 | 2 | |
|
|
3 | 3 | RUN groupadd -g 1000 build && \ |
|
|
4 | 4 | useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build |
| @@ -1,4 +1,4 | |||
|
|
1 |
FROM ubuntu: |
|
|
|
1 | FROM ubuntu:%CODENAME% | |
|
|
2 | 2 | |
|
|
3 | 3 | RUN groupadd -g 1000 build && \ |
|
|
4 | 4 | useradd -u 1000 -g 1000 -s /bin/bash -d /build -m build |
| @@ -15,7 +15,10 CONTAINER=hg-docker-$PLATFORM | |||
|
|
15 | 15 | |
|
|
16 | 16 | DOCKER=$($BUILDDIR/hg-docker docker-path) |
|
|
17 | 17 | |
|
|
18 | $BUILDDIR/hg-docker build $BUILDDIR/docker/$PLATFORM $CONTAINER | |
|
|
18 | $BUILDDIR/hg-docker build \ | |
|
|
19 | --build-arg CODENAME=$CODENAME \ | |
|
|
20 | $BUILDDIR/docker/$DISTID.template \ | |
|
|
21 | $CONTAINER | |
|
|
19 | 22 | |
|
|
20 | 23 | # debuild only appears to be able to save built debs etc to .., so we |
|
|
21 | 24 | # have to share the .. of the current directory with the docker |
General Comments 0
You need to be logged in to leave comments.
Login now