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

diff --git a/id-deb-build/docker-build.sh b/id-deb-build/docker-build.sh
index 8ae0d73..4a03468 100755
--- a/id-deb-build/docker-build.sh
+++ b/id-deb-build/docker-build.sh
@@ -92,18 +92,20 @@ if $upload; then
     if $centos; then
 	for dist in ${CENTOS_DIST}; do
 	    case $dist in
+		centos5)
+		    F=5.5;;
 		centos6)
-		    D=6;;
+		    F=6;;
 		centos7)
-		    D=7;;
+		    F=7;;
 		*)
 		    echo "$dist not supported"
 		    exit 1
 	    esac
-	    ssh ${UPLOAD_HOST} "mkdir -p ${UPLOAD_PATH}/${PRODUCT}/redhat/centos/$D/RPMS"
-	    ssh ${UPLOAD_HOST} "mkdir -p ${UPLOAD_PATH}/${PRODUCT}/redhat/centos/$D/SRPMS"
-	    scp -r build/centos/$dist/rpmbuild/RPMS ${UPLOAD_URI}/redhat/centos/$D
-	    scp -r build/centos/$dist/rpmbuild/SRPMS ${UPLOAD_URI}/redhat/centos/$D
+	    ssh ${UPLOAD_HOST} "mkdir -p ${UPLOAD_PATH}/${PRODUCT}/redhat/centos/$F/RPMS"
+	    ssh ${UPLOAD_HOST} "mkdir -p ${UPLOAD_PATH}/${PRODUCT}/redhat/centos/$F/SRPMS"
+	    scp -r build/centos/$dist/rpmbuild/RPMS ${UPLOAD_URI}/redhat/centos/$F
+	    scp -r build/centos/$dist/rpmbuild/SRPMS ${UPLOAD_URI}/redhat/centos/$F
 	done
 	if ! ssh ${UPLOAD_HOST} "sudo -n /home/indexdata/proj/git-tools/update-archive/update-yum-archive.sh" >yum-update.log 2>&1; then
 	    echo "update-yum-archive.sh failed; inspect yum-update.log"
@@ -205,9 +207,14 @@ fi
 if test "${CENTOS_DIST}"; then
     for dist in ${CENTOS_DIST}; do
 	case $dist in
+	    centos5)
+		F=5.5
+		D=5;;
 	    centos6)
+		F=6
 		D=6;;
 	    centos7)
+		F=7
 		D=7;;
 	    *)
 		echo "$dist not supported"
@@ -216,9 +223,9 @@ if test "${CENTOS_DIST}"; then
 	cd build/centos/$dist
 
 	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 "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 'ENTRYPOINT ["/bin/sh", "-c"]' >>Dockerfile
 	docker build -t indexdata-build-centos-$D .
 	echo -n "$dist "
@@ -227,6 +234,7 @@ if test "${CENTOS_DIST}"; then
 		echo Done
 	else
 		echo "Fail. Inspect build/centos/$dist/log"
+		exit 1
 	fi
 	cd ../../..
     done
@@ -245,6 +253,7 @@ if test "${DEBIAN_DIST}"; then
 		echo Done
 	else
 		echo "Fail. Inspect build/debian/$dist/log"
+		exit 1
 	fi
 	cd ../../..
     done
@@ -263,6 +272,7 @@ if test "${UBUNTU_DIST}"; then
 		echo Done
 	else
 		echo "Fail. Inspect build/ubuntu/$dist/log"
+		exit 1
 	fi
 	cd ../../..
     done