Patchwork [08,of,10,v2] docker: use stable tags for fedora and centos - a moving target is rarely useful

login
register
mail settings
Submitter Mads Kiilerich
Date Aug. 31, 2014, 11:41 a.m.
Message ID <4d93a80727da8b53f1c7.1409485298@localhost.localdomain>
Download mbox | patch
Permalink /patch/5664/
State Accepted
Headers show

Comments

Mads Kiilerich - Aug. 31, 2014, 11:41 a.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1409485269 -7200
#      Sun Aug 31 13:41:09 2014 +0200
# Node ID 4d93a80727da8b53f1c7248c69d5271136b8b5d4
# Parent  15c5b3318c2dde7527d0be80eed3e11139d34047
docker: use stable tags for fedora and centos - a moving target is rarely useful

Patch

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -142,16 +142,16 @@  osx:
 	rm -rf dist/mercurial-*.mpkg
 	mv dist/mercurial*macosx*.zip packages/osx
 
-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
@@ -165,4 +165,4 @@  docker-centos6:
 
 .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
diff --git a/contrib/docker/centos6 b/contrib/docker/centos6
--- a/contrib/docker/centos6
+++ b/contrib/docker/centos6
@@ -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
diff --git a/contrib/docker/fedora b/contrib/docker/fedora20
rename from contrib/docker/fedora
rename to contrib/docker/fedora20
--- a/contrib/docker/fedora
+++ b/contrib/docker/fedora20
@@ -1,4 +1,4 @@ 
-FROM fedora
+FROM fedora:20
 RUN yum install -y gcc
 RUN yum install -y python-devel python-docutils
 RUN yum install -y make