Skip to content
This repository has been archived by the owner on Nov 1, 2022. It is now read-only.

Build: release modifications #2491

Merged
merged 2 commits into from
Oct 2, 2019
Merged

Build: release modifications #2491

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d88b02
Stop publishing images to Weaveworks DockerHub
hiddeco Oct 2, 2019
a68299b
Republish release tag with v prefix
hiddeco Oct 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,7 @@ jobs:
name: Maybe push prerelease images
command: |
if [ -z "${CIRCLE_TAG}" -a "${CIRCLE_BRANCH}" == "master" ]; then
# Push to weaveworks org
echo "$DOCKER_REGISTRY_PASSWORD" | docker login --username "$DOCKER_REGISTRY_USER" --password-stdin

docker tag "docker.io/fluxcd/flux:$(docker/image-tag)" "docker.io/weaveworks/flux-prerelease:$(docker/image-tag)"
docker push "docker.io/weaveworks/flux-prerelease:$(docker/image-tag)"

# Push to fluxcd org
# Re-tag image as prerelease and publish on DockerHub
echo "$DOCKER_FLUXCD_PASSWORD" | docker login --username "$DOCKER_FLUXCD_USER" --password-stdin
docker tag "docker.io/fluxcd/flux:$(docker/image-tag)" "docker.io/fluxcd/flux-prerelease:$(docker/image-tag)"
docker push "docker.io/fluxcd/flux-prerelease:$(docker/image-tag)"
Expand All @@ -142,15 +136,12 @@ jobs:
name: Maybe push release image and upload binaries
command: |
if echo "${CIRCLE_TAG}" | grep -Eq "^[0-9]+(\.[0-9]+)*(-[a-z0-9]+)?$"; then
# Publish binaries to GitHub
go get github.com/weaveworks/github-release
make release-bins
bin/upload-binaries
# Push to weaveworks org
echo "$DOCKER_REGISTRY_PASSWORD" | docker login --username "$DOCKER_REGISTRY_USER" --password-stdin
docker tag "docker.io/fluxcd/flux:${CIRCLE_TAG}" "docker.io/weaveworks/flux:${CIRCLE_TAG}"
docker push "docker.io/weaveworks/flux:${CIRCLE_TAG}"

# Push to fluxcd org
# Publish image on DockerHub
echo "$DOCKER_FLUXCD_PASSWORD" | docker login --username "$DOCKER_FLUXCD_USER" --password-stdin
docker push "docker.io/fluxcd/flux:${CIRCLE_TAG}"
fi
Expand Down