##// END OF EJS Templates
docker: use stable tags for fedora and centos...
Mads Kiilerich -
r22442:77da9c03 default
parent child Browse files
Show More
@@ -144,16 +144,16 b' osx:'
144 N=`cd dist && echo mercurial-*.mpkg | sed 's,\.mpkg$$,,'` && hdiutil create -srcfolder dist/$$N.mpkg/ -scrub -volname "$$N" -ov packages/osx/$$N.dmg
144 N=`cd dist && echo mercurial-*.mpkg | sed 's,\.mpkg$$,,'` && hdiutil create -srcfolder dist/$$N.mpkg/ -scrub -volname "$$N" -ov packages/osx/$$N.dmg
145 rm -rf dist/mercurial-*.mpkg
145 rm -rf dist/mercurial-*.mpkg
146
146
147 fedora:
147 fedora20:
148 mkdir -p packages/fedora
148 mkdir -p packages/fedora20
149 contrib/buildrpm
149 contrib/buildrpm
150 cp rpmbuild/RPMS/*/* packages/fedora
150 cp rpmbuild/RPMS/*/* packages/fedora20
151 cp rpmbuild/SRPMS/* packages/fedora
151 cp rpmbuild/SRPMS/* packages/fedora20
152 rm -rf rpmbuild
152 rm -rf rpmbuild
153
153
154 docker-fedora:
154 docker-fedora20:
155 mkdir -p packages/fedora
155 mkdir -p packages/fedora20
156 contrib/dockerrpm fedora
156 contrib/dockerrpm fedora20
157
157
158 centos6:
158 centos6:
159 mkdir -p packages/centos6
159 mkdir -p packages/centos6
@@ -167,4 +167,4 b' docker-centos6:'
167
167
168 .PHONY: help all local build doc clean install install-bin install-doc \
168 .PHONY: help all local build doc clean install install-bin install-doc \
169 install-home install-home-bin install-home-doc dist dist-notests tests \
169 install-home install-home-bin install-home-doc dist dist-notests tests \
170 update-pot fedora docker-fedora
170 update-pot fedora20 docker-fedora20
@@ -1,4 +1,4 b''
1 FROM centos
1 FROM centos:centos6
2 RUN yum install -y gcc
2 RUN yum install -y gcc
3 RUN yum install -y python-devel python-docutils
3 RUN yum install -y python-devel python-docutils
4 RUN yum install -y make
4 RUN yum install -y make
@@ -1,4 +1,4 b''
1 FROM fedora
1 FROM fedora:20
2 RUN yum install -y gcc
2 RUN yum install -y gcc
3 RUN yum install -y python-devel python-docutils
3 RUN yum install -y python-devel python-docutils
4 RUN yum install -y make
4 RUN yum install -y make
General Comments 0
You need to be logged in to leave comments. Login now