mirror of https://gitee.com/bigwinds/arangodb
Allow for build-docker.sh to build with maintainer mode if needed. This is done for the go driver tests. (#3254)
This commit is contained in:
parent
0d522a6136
commit
3f796f5f55
|
@ -394,6 +394,11 @@ while [ $# -gt 0 ]; do
|
||||||
shift
|
shift
|
||||||
CONFIGURE_OPTIONS+=(-DUSE_ENTERPRISE=On)
|
CONFIGURE_OPTIONS+=(-DUSE_ENTERPRISE=On)
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
--maintainer)
|
||||||
|
shift
|
||||||
|
;;
|
||||||
|
|
||||||
--retryPackages)
|
--retryPackages)
|
||||||
shift
|
shift
|
||||||
RETRY_N_TIMES=$1
|
RETRY_N_TIMES=$1
|
||||||
|
@ -418,8 +423,6 @@ if test -n "$LASTREV"; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if [ "$GCC5" == 1 ]; then
|
if [ "$GCC5" == 1 ]; then
|
||||||
CC=/usr/bin/gcc-5
|
CC=/usr/bin/gcc-5
|
||||||
CXX=/usr/bin/g++-5
|
CXX=/usr/bin/g++-5
|
||||||
|
|
|
@ -9,17 +9,22 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
|
|
||||||
cd ${DIR}/..
|
cd ${DIR}/..
|
||||||
|
|
||||||
|
BUILD_CONFIGURATION="standard"
|
||||||
|
|
||||||
EP=""
|
EP=""
|
||||||
for i in $@; do
|
for i in $@; do
|
||||||
if test "$i" == "--enterprise"; then
|
if test "$i" == "--enterprise"; then
|
||||||
EP="EP"
|
EP="EP"
|
||||||
fi
|
fi
|
||||||
|
if test "$i" == "--maintainer"; then
|
||||||
|
BUILD_CONFIGURATION="maintainer"
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
export CPU_CORES=$(grep -c ^processor /proc/cpuinfo)
|
export CPU_CORES=$(grep -c ^processor /proc/cpuinfo)
|
||||||
|
|
||||||
./Installation/Jenkins/build.sh \
|
./Installation/Jenkins/build.sh \
|
||||||
standard \
|
${BUILD_CONFIGURATION} \
|
||||||
--rpath \
|
--rpath \
|
||||||
--parallel ${CPU_CORES} \
|
--parallel ${CPU_CORES} \
|
||||||
--package DEB \
|
--package DEB \
|
||||||
|
|
|
@ -19,7 +19,10 @@ DOCKERFILENAME=Dockerfile$(echo ${VERSION} | cut -d '.' -f 1,2 --output-delimite
|
||||||
for i in $@; do
|
for i in $@; do
|
||||||
if test "$i" == "--enterprise"; then
|
if test "$i" == "--enterprise"; then
|
||||||
DEBIMAGE_NAME="arangodb3e-${DEBVERSION}_amd64"
|
DEBIMAGE_NAME="arangodb3e-${DEBVERSION}_amd64"
|
||||||
BUILDDEB_ARGS="--enterprise git@github.com:arangodb/enterprise.git "
|
BUILDDEB_ARGS+=" --enterprise git@github.com:arangodb/enterprise.git "
|
||||||
|
fi
|
||||||
|
if test "$i" == "--maintainer"; then
|
||||||
|
BUILDDEB_ARGS+=" --maintainer"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
if [ ! -z "${SSH_AUTH_SOCK}" ]; then
|
if [ ! -z "${SSH_AUTH_SOCK}" ]; then
|
||||||
|
|
Loading…
Reference in New Issue