You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2018/11/07 20:13:29 UTC
[mesos] branch master updated (2fa6598 -> 14bda1a)
This is an automated email from the ASF dual-hosted git repository.
jieyu pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git.
from 2fa6598 Add info about Rhythm framework
new 3b86356 Updated Marathon in Mesos mini docker container.
new 14bda1a Updated the way to generate tag for Mesos mini.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
support/jenkins/mini.sh | 20 ++++++++++++++++----
support/mesos-mini/Dockerfile | 2 +-
2 files changed, 17 insertions(+), 5 deletions(-)
[mesos] 01/02: Updated Marathon in Mesos mini docker container.
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jieyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 3b8635654d14c127c0aded8aa0b2027c9971015c
Author: Jie Yu <yu...@gmail.com>
AuthorDate: Wed Nov 7 10:12:33 2018 -0800
Updated Marathon in Mesos mini docker container.
---
support/mesos-mini/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/support/mesos-mini/Dockerfile b/support/mesos-mini/Dockerfile
index 94b0836..f8af422 100644
--- a/support/mesos-mini/Dockerfile
+++ b/support/mesos-mini/Dockerfile
@@ -57,7 +57,7 @@ COPY mesos/agent_environment /etc/default/mesos-agent
COPY mesos/modules /etc/mesos/modules
# Prepare Marathon environment.
-ARG MARATHON_URL=https://downloads.mesosphere.com/marathon/releases/1.5.5/marathon-1.5.5.tgz
+ARG MARATHON_URL=https://downloads.mesosphere.com/marathon/releases/1.6.322/marathon-1.6.322-2bf46b341.tgz
ARG MARATHON_INSTALL_DIR=/usr/local/marathon
RUN mkdir -p $MARATHON_INSTALL_DIR && \
[mesos] 02/02: Updated the way to generate tag for Mesos mini.
Posted by ji...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jieyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 14bda1ae68c998fad0c09c2a94e3a51825be421a
Author: Jie Yu <yu...@gmail.com>
AuthorDate: Wed Nov 7 12:10:50 2018 -0800
Updated the way to generate tag for Mesos mini.
---
support/jenkins/mini.sh | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/support/jenkins/mini.sh b/support/jenkins/mini.sh
index 76b3cc7..fbf0d8b 100755
--- a/support/jenkins/mini.sh
+++ b/support/jenkins/mini.sh
@@ -13,10 +13,24 @@ DOCKER_IMAGE_DISTRO=${DOCKER_IMAGE_DISTRO:-"mesos/mesos-centos"}
MESOS_SHA=${MESOS_SHA:-$(git rev-parse HEAD)}
MESOS_TAG_OR_SHA=$(git describe --exact-match "${MESOS_SHA}" 2>/dev/null || echo "${MESOS_SHA}")
-DOCKER_IMAGE_TAG="${MESOS_TAG_OR_SHA}"
+RELEASE_BRANCH=$(git branch --points-at HEAD -r | grep -E 'origin/[0-9]*\.[0-9]*\.[0-9]*x' | grep -E -o '[0-9]*\.[0-9]*\.[0-9]*' || true)
+
+if [ -z "${RELEASE_BRANCH}" ]; then
+ RELEASE_BRANCH="master"
+fi
+
+DATE=$(date +%F)
+
+if [[ "${MESOS_TAG_OR_SHA}" != "${MESOS_SHA}" ]]; then
+ # HEAD is also a tag.
+ DOCKER_IMAGE_TAG="${MESOS_TAG_OR_SHA}"
+else
+ DOCKER_IMAGE_TAG="${RELEASE_BRANCH}-${DATE}"
+fi
echo "MESOS_SHA=${MESOS_SHA}"
-echo "DOCKER_IMAGE_TAG=${MESOS_TAG_OR_SHA}"
+echo "RELEASE_BRANCH=${RELEASE_BRANCH}"
+echo "DOCKER_IMAGE_TAG=${DOCKER_IMAGE_TAG}"
function cleanup {
docker rmi "$(docker images -q "${DOCKER_IMAGE}:${DOCKER_IMAGE_TAG}")" || true
@@ -32,7 +46,5 @@ DOCKER_IMAGE_DISTRO=${DOCKER_IMAGE_DISTRO} \
DATE=$(date +%F)
-docker tag "${DOCKER_IMAGE}:${DOCKER_IMAGE_TAG}" "${DOCKER_IMAGE}:${DATE}"
docker login -u "${USERNAME}" -p "${PASSWORD}"
docker push "${DOCKER_IMAGE}:${DOCKER_IMAGE_TAG}"
-docker push "${DOCKER_IMAGE}:${DATE}"