X-Git-Url: http://git.indexdata.com/?p=git-tools-moved-to-github.git;a=blobdiff_plain;f=id-deb-build%2Fdocker-build.sh;h=8ae0d73c10fdbced99a6e1367bed2f3caacb6efb;hp=780bcfc05f658fd494122a36a93a5ecd61d5253f;hb=19646e2cd7432de9eaa255b0543755c31f2d661e;hpb=d05e0aa0fee7aa62cf5f2338a7bb507f51b52fba

diff --git a/id-deb-build/docker-build.sh b/id-deb-build/docker-build.sh
index 780bcfc..8ae0d73 100755
--- a/id-deb-build/docker-build.sh
+++ b/id-deb-build/docker-build.sh
@@ -204,7 +204,6 @@ fi
 
 if test "${CENTOS_DIST}"; then
     for dist in ${CENTOS_DIST}; do
-	echo -n "$dist "
 	case $dist in
 	    centos6)
 		D=6;;
@@ -215,7 +214,15 @@ if test "${CENTOS_DIST}"; then
 		exit 1
 	esac
 	cd build/centos/$dist
-	docker run --rm  -v "$PWD:/build" -w /build/rpmbuild centos:$D ../in-docker-rpm.sh centos $D >log 2>&1
+
+	echo "FROM centos:$D" >Dockerfile
+	echo "RUN yum install -y wget yum-utils rpm-build gcc gcc-c++ make" >>Dockerfile
+	echo "RUN rpm --import http://ftp.indexdata.com/pub/yum/centos/$D/RPM-GPG-KEY-indexdata" >>Dockerfile
+	echo "RUN wget http://ftp.indexdata.com/pub/yum/centos/$D/indexdata.repo -P /etc/yum.repos.d/" >>Dockerfile
+	echo 'ENTRYPOINT ["/bin/sh", "-c"]' >>Dockerfile
+	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
 	if test $? -eq 0; then
 		echo Done
 	else
@@ -226,9 +233,14 @@ if test "${CENTOS_DIST}"; then
 fi
 if test "${DEBIAN_DIST}"; then
     for dist in ${DEBIAN_DIST}; do
-	echo -n "Debian $dist "
 	cd build/debian/$dist
-	docker run --rm  -v "$PWD:/build" -w /build/$PRODUCT-$VERSION debian:$dist ../in-docker.sh debian $dist >log 2>&1
+	echo "FROM debian:$dist" >Dockerfile
+	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/debian $dist main\" >/etc/apt/sources.list.d/indexdata.list" >>Dockerfile
+	docker build -t indexdata-build-debian-$dist .
+	echo -n "Debian $dist "
+	docker run --rm  -v "$PWD:/build" -w /build/$PRODUCT-$VERSION indexdata-build-debian-$dist ../in-docker.sh >log 2>&1
 	if test $? -eq 0; then
 		echo Done
 	else
@@ -239,9 +251,14 @@ if test "${DEBIAN_DIST}"; then
 fi
 if test "${UBUNTU_DIST}"; then
     for dist in ${UBUNTU_DIST}; do
-	echo -n "Ubuntu $dist"
 	cd build/ubuntu/$dist
-	docker run --rm  -v "$PWD:/build" -w /build/$PRODUCT-$VERSION ubuntu:$dist ../in-docker.sh ubuntu $dist >log 2>&1
+	echo "FROM ubuntu:$dist" >Dockerfile
+	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/ubuntu $dist main\" >/etc/apt/sources.list.d/indexdata.list" >>Dockerfile
+	docker build -t indexdata-build-ubuntu-$dist .
+	echo -n "Ubuntu $dist "
+	docker run --rm  -v "$PWD:/build" -w /build/$PRODUCT-$VERSION indexdata-build-ubuntu-$dist ../in-docker.sh >log 2>&1
 	if test $? -eq 0; then
 		echo Done
 	else