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/08 19:32:52 UTC
[mesos] branch master updated (2450b89 -> ffe774e)
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 2450b89 Pushed latest tag to Dockerhub for Mesos mini jenkins script.
new 78c2396 Pushed latest tag to Dockerhub for CentOS jenkins script.
new ffe774e Fixed the Docker image cleanup in Mesos mini scripts.
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/docker-centos.sh | 10 +++++++++-
support/jenkins/mini.sh | 5 +++--
2 files changed, 12 insertions(+), 3 deletions(-)
[mesos] 02/02: Fixed the Docker image cleanup in Mesos mini scripts.
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 ffe774e7fd62bc8f4be18fb29cfaf2ead690bdba
Author: Jie Yu <yu...@gmail.com>
AuthorDate: Thu Nov 8 11:32:34 2018 -0800
Fixed the Docker image cleanup in Mesos mini scripts.
---
support/jenkins/mini.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/support/jenkins/mini.sh b/support/jenkins/mini.sh
index 29af003..a012c6c 100755
--- a/support/jenkins/mini.sh
+++ b/support/jenkins/mini.sh
@@ -35,8 +35,9 @@ 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
- docker rmi "$(docker images -q "${DOCKER_IMAGE_DISTRO}:${DOCKER_IMAGE_TAG}")" || true
+ docker rmi "${DOCKER_IMAGE}:${DOCKER_IMAGE_LATEST_TAG}" || true
+ docker rmi "${DOCKER_IMAGE}:${DOCKER_IMAGE_TAG}" || true
+ docker rmi "${DOCKER_IMAGE_DISTRO}:${DOCKER_IMAGE_TAG}" || true
}
trap cleanup EXIT
[mesos] 01/02: Pushed latest tag to Dockerhub for CentOS jenkins
script.
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 78c2396e6af2ffe11d2f14309bb9f67c58d45c7a
Author: Jie Yu <yu...@gmail.com>
AuthorDate: Thu Nov 8 11:30:35 2018 -0800
Pushed latest tag to Dockerhub for CentOS jenkins script.
---
support/jenkins/docker-centos.sh | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/support/jenkins/docker-centos.sh b/support/jenkins/docker-centos.sh
index 5c27cf8..c0612d0 100755
--- a/support/jenkins/docker-centos.sh
+++ b/support/jenkins/docker-centos.sh
@@ -26,8 +26,10 @@ DATE=$(date +%F)
if [[ "${MESOS_TAG_OR_SHA}" != "${MESOS_SHA}" ]]; then
# HEAD is also a tag.
DOCKER_IMAGE_TAG="${MESOS_TAG_OR_SHA}"
+ DOCKER_IMAGE_LATEST_TAG=""
else
DOCKER_IMAGE_TAG="${RELEASE_BRANCH}-${DATE}"
+ DOCKER_IMAGE_LATEST_TAG="${RELEASE_BRANCH}"
fi
echo "MESOS_SHA=${MESOS_SHA}"
@@ -35,7 +37,8 @@ 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
+ docker rmi "${DOCKER_IMAGE}:${DOCKER_IMAGE_LATEST_TAG}" || true
+ docker rmi "${DOCKER_IMAGE}:${DOCKER_IMAGE_TAG}" || true
}
trap cleanup EXIT
@@ -47,3 +50,8 @@ DOCKER_IMAGE_TAG=${DOCKER_IMAGE_TAG} \
docker login -u "${USERNAME}" -p "${PASSWORD}"
docker push "${DOCKER_IMAGE}:${DOCKER_IMAGE_TAG}"
+
+if [ ! -z "${DOCKER_IMAGE_LATEST_TAG}" ]; then
+ docker tag "${DOCKER_IMAGE}:${DOCKER_IMAGE_TAG}" "${DOCKER_IMAGE}:${DOCKER_IMAGE_LATEST_TAG}"
+ docker push "${DOCKER_IMAGE}:${DOCKER_IMAGE_LATEST_TAG}"
+fi