From 62aaf759889ad067d749e3f85f3a6fe80056cc7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Cervi=C3=B1o?= Date: Wed, 26 Jul 2017 10:39:02 +0200 Subject: [PATCH 1/2] Fix docker push with multiple tags --- .circleci/config.yml | 3 ++- utils/release.sh | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index caf441e201..461344eb5c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -62,7 +62,8 @@ jobs: docker login -u ${DOCKER_USER} -p ${DOCKER_PASS} echo Tagging to lynckia/licode:${SHORT_GIT_HASH} docker tag lynckia/licode:develop lynckia/licode:${SHORT_GIT_HASH} - docker push lynckia/licode:develop lynckia/licode:${SHORT_GIT_HASH} + docker push lynckia/licode:develop + docker push lynckia/licode:${SHORT_GIT_HASH} fi prerelease: diff --git a/utils/release.sh b/utils/release.sh index b6e8d1c9a1..5ced92f87f 100755 --- a/utils/release.sh +++ b/utils/release.sh @@ -80,7 +80,8 @@ if [ "$MODE" = "PRERELEASE" ]; then # Tag with minor version and staging docker tag lynckia/licode:${SHORT_GIT_HASH} lynckia/licode:${NEXT_PRERELEASE_NAME} docker tag lynckia/licode:${SHORT_GIT_HASH} lynckia/licode:staging - docker push lynckia/licode:${NEXT_PRERELEASE_NAME} lynckia/licode:staging + docker push lynckia/licode:${NEXT_PRERELEASE_NAME} + docker push lynckia/licode:staging LOGS=`git log $PREVIOUS_VERSION..$COMMIT --oneline | perl -p -e 's/\n/\\\\n/'` DESCRIPTION="### Detailed PR List:\\n$LOGS" @@ -108,7 +109,8 @@ elif [ "$MODE" = "RELEASE" ]; then # Tag with minor version and staging docker tag lynckia/licode:${LATEST_PRERELEASE_NAME} lynckia/licode:${RELEASE_NAME} docker tag lynckia/licode:${LATEST_PRERELEASE_NAME} lynckia/licode:latest - docker push lynckia/licode:${RELEASE_NAME} lynckia/licode:latest + docker push lynckia/licode:${RELEASE_NAME} + docker push lynckia/licode:latest # TODO(javier): Remove lynckia/licode:XXX that belongs to this release From ec79c9f79ea4ed59895bb9dc442fff9b01de9142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Cervi=C3=B1o?= Date: Wed, 26 Jul 2017 10:41:53 +0200 Subject: [PATCH 2/2] Avoid builds with changes in circleci --- .dockerignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.dockerignore b/.dockerignore index f436a6eae0..0e4826541a 100644 --- a/.dockerignore +++ b/.dockerignore @@ -2,6 +2,7 @@ .project .cproject .git +.circleci licode_config.js rtp_media_config.js utils/release.sh