##// END OF EJS Templates
packaging: move most of contrib/docker to contrib/packaging/docker...
Gregory Szorc -
r38023:1335bbfb default
parent child Browse files
Show More
@@ -31,8 +31,8 b' build'
31 31 contrib/chg/chg
32 32 contrib/hgsh/hgsh
33 33 contrib/vagrant/.vagrant
34 contrib/docker/debian-*
35 contrib/docker/ubuntu-*
34 contrib/packaging/docker/debian-*
35 contrib/packaging/docker/ubuntu-*
36 36 dist
37 37 packages
38 38 doc/common.txt
@@ -209,40 +209,40 b' deb:'
209 209 ppa:
210 210 contrib/builddeb --source-only
211 211
212 contrib/docker/debian-%: contrib/docker/debian.template
212 contrib/packaging/docker/debian-%: contrib/packaging/docker/debian.template
213 213 sed "s/__CODENAME__/$*/" $< > $@
214 214
215 docker-debian-jessie: contrib/docker/debian-jessie
215 docker-debian-jessie: contrib/packaging/docker/debian-jessie
216 216 contrib/dockerdeb debian jessie
217 217
218 docker-debian-stretch: contrib/docker/debian-stretch
218 docker-debian-stretch: contrib/packaging/docker/debian-stretch
219 219 contrib/dockerdeb debian stretch
220 220
221 contrib/docker/ubuntu-%: contrib/docker/ubuntu.template
221 contrib/packaging/docker/ubuntu-%: contrib/packaging/docker/ubuntu.template
222 222 sed "s/__CODENAME__/$*/" $< > $@
223 223
224 docker-ubuntu-trusty: contrib/docker/ubuntu-trusty
224 docker-ubuntu-trusty: contrib/packaging/docker/ubuntu-trusty
225 225 contrib/dockerdeb ubuntu trusty
226 226
227 docker-ubuntu-trusty-ppa: contrib/docker/ubuntu-trusty
227 docker-ubuntu-trusty-ppa: contrib/packaging/docker/ubuntu-trusty
228 228 contrib/dockerdeb ubuntu trusty --source-only
229 229
230 docker-ubuntu-xenial: contrib/docker/ubuntu-xenial
230 docker-ubuntu-xenial: contrib/packaging/docker/ubuntu-xenial
231 231 contrib/dockerdeb ubuntu xenial
232 232
233 docker-ubuntu-xenial-ppa: contrib/docker/ubuntu-xenial
233 docker-ubuntu-xenial-ppa: contrib/packaging/docker/ubuntu-xenial
234 234 contrib/dockerdeb ubuntu xenial --source-only
235 235
236 docker-ubuntu-artful: contrib/docker/ubuntu-artful
236 docker-ubuntu-artful: contrib/packaging/docker/ubuntu-artful
237 237 contrib/dockerdeb ubuntu artful
238 238
239 docker-ubuntu-artful-ppa: contrib/docker/ubuntu-artful
239 docker-ubuntu-artful-ppa: contrib/packaging/docker/ubuntu-artful
240 240 contrib/dockerdeb ubuntu artful --source-only
241 241
242 docker-ubuntu-bionic: contrib/docker/ubuntu-bionic
242 docker-ubuntu-bionic: contrib/packaging/docker/ubuntu-bionic
243 243 contrib/dockerdeb ubuntu bionic
244 244
245 docker-ubuntu-bionic-ppa: contrib/docker/ubuntu-bionic
245 docker-ubuntu-bionic-ppa: contrib/packaging/docker/ubuntu-bionic
246 246 contrib/dockerdeb ubuntu bionic --source-only
247 247
248 248 fedora20:
@@ -22,7 +22,7 b' function checkdocker() {'
22 22 function initcontainer() {
23 23 [ "$1" ] || { echo "Error: platform name must be specified"; exit 1; }
24 24
25 DFILE="$ROOTDIR/contrib/docker/$1"
25 DFILE="$ROOTDIR/contrib/packaging/docker/$1"
26 26 [ -f "$DFILE" ] || { echo "Error: docker file $DFILE not found"; exit 1; }
27 27
28 28 CONTAINER="hg-dockerrpm-$1"
1 NO CONTENT: file renamed from contrib/docker/centos5 to contrib/packaging/docker/centos5
1 NO CONTENT: file renamed from contrib/docker/centos6 to contrib/packaging/docker/centos6
1 NO CONTENT: file renamed from contrib/docker/centos7 to contrib/packaging/docker/centos7
1 NO CONTENT: file renamed from contrib/docker/debian.template to contrib/packaging/docker/debian.template
1 NO CONTENT: file renamed from contrib/docker/fedora20 to contrib/packaging/docker/fedora20
1 NO CONTENT: file renamed from contrib/docker/fedora21 to contrib/packaging/docker/fedora21
1 NO CONTENT: file renamed from contrib/docker/ubuntu.template to contrib/packaging/docker/ubuntu.template
General Comments 0
You need to be logged in to leave comments. Login now