CentOS 5 no longer supported

[git-tools-moved-to-github.git] / id-deb-build / docker-build.sh

diff --git a/id-deb-build/docker-build.sh b/id-deb-build/docker-build.sh
index 2c3a528..f09202a 100755 (executable)
--- a/id-deb-build/docker-build.sh
+++ b/id-deb-build/docker-build.sh
@@ -17,8 +17,6 @@ centos_map()
 {
     dist=$1
     case $dist in
-       centos5)
-           F=5;;
        centos6)
            F=6;;
        centos7)
@@ -37,9 +35,9 @@ prepare_deb()
 
     for dist in ${DISTS}; do
        test -f build/$TYPE/$dist && sudo rm -fr build/$TYPE/$dist
-       mkdir -p build/$TYPEn
+       mkdir -p build/$TYPE
        cp -a deb-src build/$TYPE/$dist
-       cp ${ID_DEB_BUILD}/in-docker.sh build/$TYPE/$dist
+       cp ${ID_DEB_BUILD}/in-docker-deb.sh build/$TYPE/$dist
     done
 }
 
@@ -51,12 +49,13 @@ run_deb()
     for dist in ${DISTS}; do
        cd build/$TYPE/$dist
        echo "FROM $TYPE:$dist" >Dockerfile
+       echo "ENV DEBIAN_FRONTEND noninteractive" >>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/$TYPE $dist main\" >/etc/apt/sources.list.d/indexdata.list" >>Dockerfile
        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-deb.sh >log 2>&1
        if test $? -eq 0; then
                echo Done
        else
@@ -164,7 +163,7 @@ if $upload; then
        if test -n "${DEBIAN_DIST}"; then
            for dist in ${DEBIAN_DIST}; do
                ssh ${UPLOAD_HOST} "mkdir -p ${UPLOAD_PATH}/${PRODUCT}/debian/${dist}"
-               if ! scp build/debian/${dist}/${PRODUCT}_* ${UPLOAD_URI}/debian/${dist}; then
+               if ! scp build/debian/${dist}/*_${VERSION}* ${UPLOAD_URI}/debian/${dist}; then
                    echo "Upload failed for $dist"
                    exit 1
                fi
@@ -173,7 +172,7 @@ if $upload; then
        if test -n "${UBUNTU_DIST}"; then
            for dist in ${UBUNTU_DIST}; do
                ssh ${UPLOAD_HOST} "mkdir -p ${UPLOAD_PATH}/${PRODUCT}/ubuntu/${dist}"
-               if ! scp build/ubuntu/${dist}/${PRODUCT}_* ${UPLOAD_URI}/ubuntu/${dist}; then
+               if ! scp build/ubuntu/${dist}/*_${VERSION}* ${UPLOAD_URI}/ubuntu/${dist}; then
                    echo "Upload failed for $dist"
                    exit 1
                fi
@@ -217,6 +216,7 @@ if $debian; then
     if ! ${ID_DEB_BUILD}/id-mk-deb-changelog.sh; then
         echo "id-mk-deb-changelog.sh failed"
     fi
+    rm -fr deb-src
     if ! ${MKDEBSRC}; then
         echo "id-mk-deb-src.sh failed"
     fi
@@ -233,11 +233,10 @@ if $debian; then
     fi
 fi
 if test "${DEBIAN_DIST}"; then
-    prepare_deb debian ${DEBIAN_DIST}
+    prepare_deb debian "${DEBIAN_DIST}"
 fi
-
 if test "${UBUNTU_DIST}"; then
-    prepare_deb ubuntu ${UBUNTU_DIST}
+    prepare_deb ubuntu "${UBUNTU_DIST}"
 fi
 
 if test "${CENTOS_DIST}"; then
@@ -250,7 +249,7 @@ 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 .
        echo -n "$dist "
@@ -265,10 +264,10 @@ if test "${CENTOS_DIST}"; then
     done
 fi
 if test "${DEBIAN_DIST}"; then
-    run_deb debian ${DEBIAN_DIST}
+    run_deb debian "${DEBIAN_DIST}"
 fi
 if test "${UBUNTU_DIST}"; then
-    run_deb ubuntu ${UBUNTU_DIST}
+    run_deb ubuntu "${UBUNTU_DIST}"
 fi
 
 # Local Variables: