Skip to content

Commit

Permalink
Merge pull request #1290 from srenatus/sr/release-process/update-quay…
Browse files Browse the repository at this point in the history
…-notes

release process: update quay notes
  • Loading branch information
ericchiang authored Sep 10, 2018
2 parents 1260c62 + 9cc85c4 commit 29bc098
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 21 deletions.
22 changes: 3 additions & 19 deletions Documentation/dev-releases.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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 [email protected]:dexidp/dex.git v2.0.0
Expand Down Expand Up @@ -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
```
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
2 changes: 1 addition & 1 deletion examples/k8s/dex.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ spec:
app: dex
spec:
containers:
- image: quay.io/coreos/dex:v2.10.0
- image: quay.io/dexidp/dex:v2.10.0
name: dex
command: ["/usr/local/bin/dex", "serve", "/etc/dex/cfg/config.yaml"]

Expand Down

0 comments on commit 29bc098

Please sign in to comment.