1
0
Fork 0

build docker to build using stretch container (#3061)

This commit is contained in:
Kaveh Vahedipour 2017-08-17 14:11:15 +02:00 committed by GitHub
parent 1d6b7abc80
commit b311e04b42
1 changed files with 5 additions and 5 deletions

View File

@ -13,7 +13,7 @@ export DEBVERSION=${VERSION}-1
DOCKERTAG=${VERSION}-local
DEBIMAGE_NAME="arangodb3-${DEBVERSION}_amd64"
BUILDDEB_ARGS=""
BUILDDEB_DOCKER_ARGS=""
BUILDDEB_DOCKER_ARGS="--gcc6"
DOCKERFILENAME=Dockerfile$(echo ${VERSION} | cut -d '.' -f 1,2 --output-delimiter=).local
for i in $@; do
if test "$i" == "--enterprise"; then
@ -25,12 +25,12 @@ if [ ! -z "${SSH_AUTH_SOCK}" ]; then
BUILDDEB_DOCKER_ARGS="${BUILDDEB_DOCKER_ARGS} -v ${SSH_AUTH_SOCK}:/.ssh-agent -e SSH_AUTH_SOCK=/.ssh-agent"
fi
# Create debian-jessie-builder
# Create debian-stretch-builder
if [ ! -e ${BUILDDIR}/.build-docker-containers ]; then
cd ${BUILDDIR}
git clone https://github.com/arangodb-helper/build-docker-containers ${BUILDDIR}/.build-docker-containers
fi
docker build -t arangodb/debian-jessie-builder ${BUILDDIR}/.build-docker-containers/distros/debian/jessie/build/
docker build -t arangodb/debian-stretch-builder ${BUILDDIR}/.build-docker-containers/distros/debian/stretch/build/
# Ensure arangodb/arangodb-docker exists
if [ ! -e ${BUILDDIR}/.arangodb-docker ]; then
@ -38,14 +38,14 @@ if [ ! -e ${BUILDDIR}/.arangodb-docker ]; then
git clone https://github.com/arangodb/arangodb-docker ${BUILDDIR}/.arangodb-docker
fi
# Build jessie package
# Build stretch package
docker run -i \
-e GIT_SSH_COMMAND="ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" \
-v ${ROOTDIR}:/arangodb \
-v ${ROOTDIR}/build-tmp:/var/tmp \
-w /arangodb \
${BUILDDEB_DOCKER_ARGS} \
arangodb/debian-jessie-builder \
arangodb/debian-stretch-builder \
/arangodb/scripts/build-deb.sh $BUILDDEB_ARGS
# Copy deb image to docker build root