Patchwork [1,of,2] docker: add centos7 target for CentOS / Red Hat 7 support

login
register
mail settings
Submitter Mads Kiilerich
Date Oct. 16, 2014, 3:45 p.m.
Message ID <6cf23144b61e47c7579e.1413474307@ssl.google-analytics.com>
Download mbox | patch
Permalink /patch/6330/
State Accepted
Headers show

Comments

Mads Kiilerich - Oct. 16, 2014, 3:45 p.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1413474254 -7200
#      Thu Oct 16 17:44:14 2014 +0200
# Node ID 6cf23144b61e47c7579e4ca42773c24d7f8cf31b
# Parent  da2758c0aca04fe20fef2797f80c6079099afca5
docker: add centos7 target for CentOS / Red Hat 7 support

Patch

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -175,6 +175,16 @@  docker-centos6:
 	mkdir -p packages/centos6
 	contrib/dockerrpm centos6
 
+centos7:
+	mkdir -p packages/centos7
+	contrib/buildrpm
+	cp rpmbuild/RPMS/*/* packages/centos7
+	cp rpmbuild/SRPMS/* packages/centos7
+
+docker-centos7:
+	mkdir -p packages/centos7
+	contrib/dockerrpm centos7
+
 .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 fedora20 docker-fedora20
diff --git a/contrib/docker/centos6 b/contrib/docker/centos7
copy from contrib/docker/centos6
copy to contrib/docker/centos7
--- a/contrib/docker/centos6
+++ b/contrib/docker/centos7
@@ -1,4 +1,4 @@ 
-FROM centos:centos6
+FROM centos:centos7
 RUN yum install -y gcc
 RUN yum install -y python-devel python-docutils
 RUN yum install -y make