diff --git a/Documentation/dev-releases.md b/Documentation/dev-releases.md index 1a3567032c7e5a5662ff7b0ad42e2d0a7bc8b90d..5bbaec86177044cfeb406d969f4d7340c62919d1 100644 --- a/Documentation/dev-releases.md +++ b/Documentation/dev-releases.md @@ -3,16 +3,12 @@ Making a dex release involves: * Tagging a git commit and pushing the tag to GitHub. -* Building and pushing a Docker image. -This requires the following tools. +From this, Quay will build and tag an image via a build trigger. -* Docker - -And the following permissions. +This requires the following permissions. * Push access to the github.com/dexidp/dex git repo. -* Push access to the quay.io/coreos/dex Docker repo. ## Tagging the release @@ -34,7 +30,7 @@ you to enter a tag message, which can just be the release version. git tag -s v2.0.0 ea4c04fde83bd6c48f4d43862c406deb4ea9dba2 ``` -Push that tag to the CoreOS repo. +Push that tag to the Dex repo. ``` git push git@github.com:dexidp/dex.git v2.0.0 @@ -67,15 +63,3 @@ git push origin "cherry-picked-change" ``` Open a PR onto $RELEASE_BRANCH to get the changes approved. - -## Building the Docker image - -Build the Docker image and push to Quay. - -```bash -# checkout the tag -git checkout tags/v2.1.0 -# will prompt for sudo password -make docker-image -sudo docker push quay.io/coreos/dex:v2.1.0 -``` diff --git a/Makefile b/Makefile index 29947c9d83737edbe9edbcc10215f4e8750fc092..a9c7b61ef40e736d8b202acb4f36b7769b8ae01a 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ export PATH := $(PWD)/bin:$(PATH) VERSION ?= $(shell ./scripts/git-version) -DOCKER_REPO=quay.io/coreos/dex +DOCKER_REPO=quay.io/dexidp/dex DOCKER_IMAGE=$(DOCKER_REPO):$(VERSION) $( shell mkdir -p bin )