{
dist=$1
case $dist in
- centos5)
- F=5;;
centos6)
F=6;;
centos7)
DISTS=$2
for dist in ${DISTS}; do
- test -f build/$TYPE/$dist && sudo rm -fr build/$TYPE/$dist
+ test -d build/$TYPE/$dist && sudo rm -fr build/$TYPE/$dist
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
}
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
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
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
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