X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=id-deb-build%2Fdocker-build.sh;h=55bc4e3daff5f86f04b532ab358bbe45121524fc;hb=10a4e91794e7a718fa8374198583c324fc984067;hp=455ad08711a9289a61c5747b491ac77c1b285980;hpb=6e4ef255ce662c160dcd89aa26d2f3a933b7c843;p=git-tools-moved-to-github.git

diff --git a/id-deb-build/docker-build.sh b/id-deb-build/docker-build.sh
index 455ad08..55bc4e3 100755
--- a/id-deb-build/docker-build.sh
+++ b/id-deb-build/docker-build.sh
@@ -54,9 +54,9 @@ run_deb()
 	echo 'RUN apt-get update && apt-get -q install -y wget devscripts equivs' >>Dockerfile
 	echo 'RUN wget -q -O - http://ftp.indexdata.dk/debian/indexdata.asc|apt-key add -' >>Dockerfile
 	echo "RUN echo \"deb http://ftp.indexdata.dk/$TYPE $dist main\" >/etc/apt/sources.list.d/indexdata.list" >>Dockerfile
-	docker build -t indexdata-build-$TYPE-$dist .
+	docker build -t indexdata-build-$TYPE:$dist .
 	echo -n "$TYPE $dist "
-	docker run --rm  -v "$PWD:/build" -w /build/$PRODUCT-$VERSION indexdata-build-$TYPE-$dist ../in-docker.sh >log 2>&1
+	docker run --rm  -v "$PWD:/build" -w /build/$PRODUCT-$VERSION indexdata-build-$TYPE:$dist ../in-docker.sh >log 2>&1
 	if test $? -eq 0; then
 		echo Done
 	else
@@ -250,11 +250,11 @@ if test "${CENTOS_DIST}"; then
 	echo "FROM centos:$D" >Dockerfile
 	echo "RUN yum install -y wget yum-utils redhat-rpm-config rpm-build gcc gcc-c++ make" >>Dockerfile
 	echo "RUN rpm --import http://ftp.indexdata.com/pub/yum/centos/$F/RPM-GPG-KEY-indexdata" >>Dockerfile
-	echo "RUN wget http://ftp.indexdata.com/pub/yum/centos/$F/indexdata.repo -P /etc/yum.repos.d/" >>Dockerfile
+	echo "RUN wget -q http://ftp.indexdata.com/pub/yum/centos/$F/indexdata.repo -P /etc/yum.repos.d/" >>Dockerfile
 	echo 'ENTRYPOINT ["/bin/sh", "-c"]' >>Dockerfile
-	docker build -t indexdata-build-centos-$D .
+	docker build -t indexdata-build-centos:$D .
 	echo -n "$dist "
-	docker run --rm  -v "$PWD:/build" -w /build/rpmbuild indexdata-build-centos-$D ../in-docker-rpm.sh >log 2>&1
+	docker run --rm  -v "$PWD:/build" -w /build/rpmbuild indexdata-build-centos:$D ../in-docker-rpm.sh >log 2>&1
 	if test $? -eq 0; then
 		echo Done
 	else