Mercurial > hg

changeset 22442:77da9c03be60

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
docker: use stable tags for fedora and centos A moving target is rarely useful.
author Mads Kiilerich <madski@unity3d.com>
date Sun, 31 Aug 2014 13:41:09 +0200
parents bb9a06d14857
children d8818616c45e
files Makefile contrib/docker/centos6 contrib/docker/fedora contrib/docker/fedora20
diffstat 4 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Fri May 30 14:14:33 2014 +0200
+++ b/Makefile	Sun Aug 31 13:41:09 2014 +0200
@@ -144,16 +144,16 @@
 	N=`cd dist && echo mercurial-*.mpkg | sed 's,\.mpkg$$,,'` && hdiutil create -srcfolder dist/$$N.mpkg/ -scrub -volname "$$N" -ov packages/osx/$$N.dmg
 	rm -rf dist/mercurial-*.mpkg
 
-fedora:
-	mkdir -p packages/fedora
+fedora20:
+	mkdir -p packages/fedora20
 	contrib/buildrpm
-	cp rpmbuild/RPMS/*/* packages/fedora
-	cp rpmbuild/SRPMS/* packages/fedora
+	cp rpmbuild/RPMS/*/* packages/fedora20
+	cp rpmbuild/SRPMS/* packages/fedora20
 	rm -rf rpmbuild
 
-docker-fedora:
-	mkdir -p packages/fedora
-	contrib/dockerrpm fedora
+docker-fedora20:
+	mkdir -p packages/fedora20
+	contrib/dockerrpm fedora20
 
 centos6:
 	mkdir -p packages/centos6
@@ -167,4 +167,4 @@
 
 .PHONY: help all local build doc clean install install-bin install-doc \
 	install-home install-home-bin install-home-doc dist dist-notests tests \
-	update-pot fedora docker-fedora
+	update-pot fedora20 docker-fedora20
--- a/contrib/docker/centos6	Fri May 30 14:14:33 2014 +0200
+++ b/contrib/docker/centos6	Sun Aug 31 13:41:09 2014 +0200
@@ -1,4 +1,4 @@
-FROM centos
+FROM centos:centos6
 RUN yum install -y gcc
 RUN yum install -y python-devel python-docutils
 RUN yum install -y make
--- a/contrib/docker/fedora	Fri May 30 14:14:33 2014 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-FROM fedora
-RUN yum install -y gcc
-RUN yum install -y python-devel python-docutils
-RUN yum install -y make
-RUN yum install -y rpm-build
-RUN yum install -y gettext
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/contrib/docker/fedora20	Sun Aug 31 13:41:09 2014 +0200
@@ -0,0 +1,6 @@
+FROM fedora:20
+RUN yum install -y gcc
+RUN yum install -y python-devel python-docutils
+RUN yum install -y make
+RUN yum install -y rpm-build
+RUN yum install -y gettext