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
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 .
+ 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