diff --git a/lib/build.sh b/lib/build.sh index fb1d796..0286509 100755 --- a/lib/build.sh +++ b/lib/build.sh @@ -15,7 +15,7 @@ BUILD_TAG=${4} function build_project() { - info "Building project '${PROJECT_NAME}'..." + info "Building project '${PROJECT_NAME}' for ${TARGET_ARCH} architecture..." set_opt project_name "${PROJECT_NAME}" set_opt build_dir "${BUILD_DIR}" @@ -34,7 +34,7 @@ function build_project() cd "${workspace}" - dpkg-buildpackage -b 2> >(error) 1> >(info) + dpkg-buildpackage -b -a "${TARGET_ARCH}" 2> >(error) 1> >(info) if [ $? != 0 ]; then fatal "The build process has not completed successfuly !" diff --git a/package.sh b/package.sh index f2fcd2c..0665dfa 100755 --- a/package.sh +++ b/package.sh @@ -14,6 +14,7 @@ function show_usage { echo "Parameters: " echo echo " -p Path to the project to build" + echo " -a Optional : Target architecture (default amd64)" echo " -d Optional : Destination of the builed packages (default ./packages)" echo " -i Optional : Name of the Docker image to use for build (default: debian:jessie)" echo " -k Optional : Keep the Docker container after build " @@ -92,10 +93,14 @@ function main { # Expose host uid & gid docker_opt="${docker_opt} -e HOST_UID=$(id -u) -e HOST_GID=$(id -g)" + # Expose host proxy variables docker_opt="${docker_opt} -e HTTP_PROXY=${HTTP_PROXY} -e HTTPS_PROXY=${HTTPS_PROXY}" docker_opt="${docker_opt} -e http_proxy=${http_proxy} -e https_proxy=${https_proxy}" + # Target architecture + docker_opt="${docker_opt} -e TARGET_ARCH=${TARGET_ARCH}" + if [[ ${PERSIST_CONTAINER} -eq 0 ]] then docker_opt="${docker_opt} --rm " @@ -122,7 +127,7 @@ function main { # # Parsing options # -while getopts "kp:d:i:b:B:t:" option +while getopts "kp:d:i:b:B:t:a:" option do case $option in k) @@ -146,6 +151,9 @@ do t) BUILD_TAG=${OPTARG} ;; + a) + TARGET_ARCH=${OPTARG} + ;; *) show_usage ;; @@ -157,6 +165,7 @@ done [[ -z ${BASE_IMAGE} ]] && BASE_IMAGE="debian:jessie" [[ -z ${BUILD_BRANCH} ]] && BUILD_BRANCH="dist/ubuntu/precise/master" [[ -z ${PERSIST_CONTAINER} ]] && PERSIST_CONTAINER=0 +[[ -z ${TARGET_ARCH} ]] && TARGET_ARCH=amd64 # # Warn user about "proxy"