Skip to content

Commit

Permalink
Automate version release process (#148)
Browse files Browse the repository at this point in the history
  • Loading branch information
aeneasr authored May 18, 2019
1 parent 56f2000 commit a743dfb
Show file tree
Hide file tree
Showing 24 changed files with 4,218 additions and 4,185 deletions.
9 changes: 6 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ jobs:
- run: git config --global user.email "[email protected]"
- run: git config --global user.name "ORY Continuous Integration"
- run: "git clone https://arekkas:[email protected]/ory/ory-am.git ../ory-am"
- run: cd website; npm run api
- run: cd website; npm run release $(echo $CIRCLE_TAG | cut -d '+' -f2)
- run: cd website; npm run format
- run: "git commit -a -m 'Update files to match release $CIRCLE_TAG'"
- run: "git push origin HEAD:master"
- run: cd website; npm run build
- run: rm -rf ../ory-am/docs/*
- run: cp -R ./website/build/docs/* ../ory-am/docs/
Expand All @@ -37,5 +40,5 @@ workflows:
requires:
- test
filters:
branches:
only: master
tags:
only: /.*/
13 changes: 0 additions & 13 deletions .circleci/tag.sh

This file was deleted.

14 changes: 12 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,22 @@ markdown preview)_

## Releasing a new version

### CI

To release a new (or updated) version of the ORY Documentation, simply create a
new git tag in the format of `v0.0.X+oryOS.Z`.

**Warning:** This will also update all Docker Image tags to the latest available
release (on GitHub)!

### Manual

The ORY Documentation is versioned according to `oryOS.X` version semantics. To
(re-)release a version run:

```
$ cd website
$ npm run release oryOS.
$ export CIRCLE_TAG=vA.B.C+oryOS.D
$ cd website; npm run release
```

## Development
Expand Down
29 changes: 9 additions & 20 deletions docs/hydra/configure-deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,6 @@ not required for running ORY Hydra, we recommend using it for this tutorial as
it will greatly reduce the complexity of setting up a database on your system
without virtualization, installing Go, and compiling ORY Hydra.

## Pull Images

First, we want to use the most recent stable version available. To ensure that, let's pull the `latest` tag from Docker Hub:

> If you skip this step, you might be using an outdated version depending on your existing Docker Cache.
```shell
$ docker pull oryd/hydra:latest
$ docker pull oryd/hydra-login-consent-node:latest
```

## Create a Network

Before we can start, a network must be created which we will attach all our
Expand Down Expand Up @@ -87,11 +76,11 @@ $ export SECRETS_SYSTEM=$(export LC_CTYPE=C; cat /dev/urandom | tr -dc 'a-zA-Z0-
$ export DSN=postgres://hydra:secret@ory-hydra-example--postgres:5432/hydra?sslmode=disable

# Before starting, let's pull the latest ORY Hydra tag from docker.
$ docker pull oryd/hydra:latest
$ docker pull oryd/hydra:v1.0.0-rc.11

# This command will show you all the environment variables that you can set. Read this carefully.
# It is the equivalent to `hydra help serve`.
$ docker run -it --rm --entrypoint hydra oryd/hydra:latest help serve
$ docker run -it --rm --entrypoint hydra oryd/hydra:v1.0.0-rc.11 help serve

Starts all HTTP/2 APIs and connects to a database backend.
[...]
Expand All @@ -101,7 +90,7 @@ Starts all HTTP/2 APIs and connects to a database backend.
# It is the equivalent to `hydra migrate sql --yes postgres://hydra:secret@ory-hydra-example--postgres:5432/hydra?sslmode=disable`
$ docker run -it --rm \
--network hydraguide \
oryd/hydra:latest \
oryd/hydra:v1.0.0-rc.11 \
migrate sql --yes $DSN

Applying `client` SQL migrations...
Expand All @@ -119,7 +108,7 @@ $ docker run -d \
-e URLS_SELF_ISSUER=https://localhost:9000/ \
-e URLS_CONSENT=http://localhost:9020/consent \
-e URLS_LOGIN=http://localhost:9020/login \
oryd/hydra:latest serve all
oryd/hydra:v1.0.0-rc.11 serve all

# And check if it's running:
$ docker logs ory-hydra-example--hydra
Expand Down Expand Up @@ -187,7 +176,7 @@ ORY Hydra can be managed using the Hydra Command Line Interface (CLI), which is
using ORY Hydra's REST APIs. To see the available commands, run:

```shell
$ docker run --rm -it --entrypoint hydra oryd/hydra:latest help
$ docker run --rm -it --entrypoint hydra oryd/hydra:v1.0.0-rc.11 help
Hydra is a cloud native high throughput OAuth2 and OpenID Connect provider

Usage:
Expand All @@ -205,14 +194,14 @@ which combines both features in one app. Here, we will use deploy that app using
Docker.

```shell
$ docker pull oryd/hydra-login-consent-node:latest
$ docker pull oryd/hydra-login-consent-node:v1.0.0-rc.11
$ docker run -d \
--name ory-hydra-example--consent \
-p 9020:3000 \
--network hydraguide \
-e HYDRA_ADMIN_URL=https://ory-hydra-example--hydra:4445 \
-e NODE_TLS_REJECT_UNAUTHORIZED=0 \
oryd/hydra-login-consent-node:latest
oryd/hydra-login-consent-node:v1.0.0-rc.11

# Let's check if it's running ok:
$ docker logs ory-hydra-example--consent
Expand Down Expand Up @@ -246,7 +235,7 @@ URLs the client may request:
$ docker run --rm -it \
-e HYDRA_ADMIN_URL=https://ory-hydra-example--hydra:4445 \
--network hydraguide \
oryd/hydra:latest \
oryd/hydra:v1.0.0-rc.11 \
clients create --skip-tls-verify \
--id facebook-photo-backup \
--secret some-secret \
Expand Down Expand Up @@ -293,7 +282,7 @@ for an access token. The same thing happens with this command:
$ docker run --rm -it \
--network hydraguide \
-p 9010:9010 \
oryd/hydra:latest \
oryd/hydra:v1.0.0-rc.11 \
token user --skip-tls-verify \
--port 9010 \
--auth-url https://localhost:9000/oauth2/auth \
Expand Down
Loading

0 comments on commit a743dfb

Please sign in to comment.