This is an automated email from the ASF dual-hosted git repository. jieyu pushed a commit to branch 1.7.x in repository https://gitbox.apache.org/repos/asf/mesos.git
commit d050bc1cae4b5ae9c2c6e658583c59cb7c231bc2 Author: Jie Yu <[email protected]> AuthorDate: Sat Oct 27 22:19:32 2018 -0700 Used a better default for RPM builder docker image name. (cherry picked from commit dd87797e88763677e45f4b7ad5f52438cd81cc83) --- support/packaging/centos/build-docker-rpmbuild.sh | 2 +- support/packaging/centos/build-rpm-docker.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/support/packaging/centos/build-docker-rpmbuild.sh b/support/packaging/centos/build-docker-rpmbuild.sh index 1fdd5c7..9c01aaf 100755 --- a/support/packaging/centos/build-docker-rpmbuild.sh +++ b/support/packaging/centos/build-docker-rpmbuild.sh @@ -8,7 +8,7 @@ set -o errexit -o nounset -o pipefail -o verbose CENTOS_DIR="$(cd "$(dirname "$0")"; pwd -P)" CENTOS_DISTRO=${CENTOS_DISTRO:-"7"} -DOCKER_IMAGE=${DOCKER_IMAGE:-"mesos/mesos-centos-rpmbuild"} +DOCKER_IMAGE=${DOCKER_IMAGE:-"mesos/mesos-centos${CENTOS_DISTRO}-rpmbuild"} DOCKER_IMAGE_TAG=${DOCKER_IMAGE_TAG:-"latest"} if ! [ -x "$(command -v docker)" ]; then diff --git a/support/packaging/centos/build-rpm-docker.sh b/support/packaging/centos/build-rpm-docker.sh index e7d9c3f..9bad6d8 100755 --- a/support/packaging/centos/build-rpm-docker.sh +++ b/support/packaging/centos/build-rpm-docker.sh @@ -8,7 +8,7 @@ CENTOS_DIR="$(cd "$(dirname "$0")"; pwd -P)" SOURCE_DIR="$(cd "${CENTOS_DIR}/../../.."; pwd -P)" CENTOS_DISTRO=${CENTOS_DISTRO:-"7"} -DOCKER_IMAGE=${DOCKER_IMAGE:-"mesos/mesos-centos-rpmbuild"} +DOCKER_IMAGE=${DOCKER_IMAGE:-"mesos/mesos-centos${CENTOS_DISTRO}-rpmbuild"} DOCKER_IMAGE_TAG=${DOCKER_IMAGE_TAG:-"latest"} if ! [ -x "$(command -v docker)" ]; then
