Skip to content

Commit

Permalink
back to dev version
Browse files Browse the repository at this point in the history
  • Loading branch information
mathieuancelin committed Dec 19, 2023
1 parent 43b9197 commit 4ab3865
Show file tree
Hide file tree
Showing 21 changed files with 41 additions and 41 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
hostNetwork: false
restartPolicy: Always
containers:
- image: maif/otoroshi:16.11.2-jdk11
- image: maif/otoroshi:16.12.0-dev-jdk11
imagePullPolicy: IfNotPresent
name: otoroshi-leader
ports:
Expand Down Expand Up @@ -225,7 +225,7 @@ spec:
hostNetwork: false
restartPolicy: Always
containers:
- image: maif/otoroshi:16.11.2-dev
- image: maif/otoroshi:16.12.0-dev-dev
imagePullPolicy: IfNotPresent
name: otoroshi-worker
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
hostNetwork: false
restartPolicy: Always
containers:
- image: maif/otoroshi:16.11.2-jdk11
- image: maif/otoroshi:16.12.0-dev-jdk11
imagePullPolicy: IfNotPresent
name: otoroshi-leader
ports:
Expand Down Expand Up @@ -200,7 +200,7 @@ spec:
hostNetwork: false
restartPolicy: Always
containers:
- image: maif/otoroshi:16.11.2-dev
- image: maif/otoroshi:16.12.0-dev-dev
imagePullPolicy: IfNotPresent
name: otoroshi-worker
ports:
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/kustomize/overlays/cluster/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
hostNetwork: false
restartPolicy: Always
containers:
- image: maif/otoroshi:16.11.2-jdk11
- image: maif/otoroshi:16.12.0-dev-jdk11
imagePullPolicy: IfNotPresent
name: otoroshi-leader
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ spec:
restartPolicy: Always
hostNetwork: false
containers:
- image: maif/otoroshi:16.11.2-jdk11
- image: maif/otoroshi:16.12.0-dev-jdk11
imagePullPolicy: IfNotPresent
name: otoroshi
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
terminationGracePeriodSeconds: 60
hostNetwork: false
containers:
- image: maif/otoroshi:16.11.2-jdk11
- image: maif/otoroshi:16.12.0-dev-jdk11
imagePullPolicy: IfNotPresent
name: otoroshi
ports:
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/kustomize/overlays/simple/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
terminationGracePeriodSeconds: 60
hostNetwork: false
containers:
- image: maif/otoroshi:16.11.2-jdk11
- image: maif/otoroshi:16.12.0-dev-jdk11
imagePullPolicy: IfNotPresent
name: otoroshi
ports:
Expand Down
2 changes: 1 addition & 1 deletion manual/src/main/paradox/code/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"info" : {
"title" : "Otoroshi Admin API",
"description" : "Admin API of the Otoroshi reverse proxy",
"version" : "16.11.2",
"version" : "16.12.0-dev",
"contact" : {
"name" : "Otoroshi Team",
"email" : "[email protected]"
Expand Down
18 changes: 9 additions & 9 deletions manual/src/main/paradox/content-pretty.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion manual/src/main/paradox/content.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions manual/src/main/paradox/deploy/kubernetes.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ You can also create a `kustomization.yaml` file with a remote base

```yaml
bases:
- github.com/MAIF/otoroshi/kubernetes/kustomize/overlays/simple/?ref=v16.11.2
- github.com/MAIF/otoroshi/kubernetes/kustomize/overlays/simple/?ref=v16.12.0-dev
```
Then deploy it with `kubectl apply -k ./overlays/myoverlay`.
Expand Down Expand Up @@ -87,7 +87,7 @@ spec:
terminationGracePeriodSeconds: 60
hostNetwork: false
containers:
- image: maif/otoroshi:16.11.2
- image: maif/otoroshi:16.12.0-dev
imagePullPolicy: IfNotPresent
name: otoroshi
args: ['-Dconfig.file=/usr/app/otoroshi/conf/oto.conf']
Expand Down
2 changes: 1 addition & 1 deletion manual/src/main/paradox/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

Download the latest jar of Otoroshi
```sh
curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.11.2/otoroshi.jar'
curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.12.0-dev/otoroshi.jar'
```

Once downloading, run Otoroshi.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Let's start by downloading the latest Otoroshi
```sh
curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.11.2/otoroshi.jar'
curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.12.0-dev/otoroshi.jar'
```

By default, Otoroshi starts with domain `oto.tools` that targets `127.0.0.1` Now you are almost ready to run Otoroshi for the first time, we want run it with an initial data.
Expand Down
2 changes: 1 addition & 1 deletion manual/src/main/paradox/how-to-s/setup-otoroshi-cluster.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ In this tutorial, you create an cluster of Otoroshi.
Let's start by downloading the latest jar of Otoroshi.

```sh
curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.11.2/otoroshi.jar'
curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.12.0-dev/otoroshi.jar'
```

Then create an instance of Otoroshi and indicates with the `otoroshi.cluster.mode` environment variable that it will be the leader.
Expand Down
2 changes: 1 addition & 1 deletion manual/src/main/paradox/includes/fetch-and-start.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ If you already have an up and running otoroshi instance, you can skip the follow
Let's start by downloading the latest Otoroshi.

```sh
curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.11.2/otoroshi.jar'
curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.12.0-dev/otoroshi.jar'
```

then you can run start Otoroshi :
Expand Down
2 changes: 1 addition & 1 deletion manual/src/main/paradox/includes/initialize.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ If you already have an up and running otoroshi instance, you can skip the follow
Let's start by downloading the latest Otoroshi.

```sh
curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.11.2/otoroshi.jar'
curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.12.0-dev/otoroshi.jar'
```

then you can run start Otoroshi :
Expand Down
6 changes: 3 additions & 3 deletions manual/src/main/paradox/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
> *The <a href="https://en.wikipedia.org/wiki/Gazu_Hyakki_Yagy%C5%8D#/media/File:SekienOtoroshi.jpg" target="blank">Otoroshi</a> is a large hairy monster that tends to lurk on the top of the torii gate in front of Shinto shrines. It's a hostile creature, but also said to be the guardian of the shrine and is said to leap down from the top of the gate to devour those who approach the shrine for only self-serving purposes.*
@@@ div { .centered-img }
[![Join the discord](https://img.shields.io/discord/1089571852940218538?color=f9b000&label=Community&logo=Discord&logoColor=f9b000)](https://discord.gg/dmbwZrfpcQ) [ ![Download](https://img.shields.io/github/release/MAIF/otoroshi.svg) ](hhttps://github.com/MAIF/otoroshi/releases/download/v16.11.2/otoroshi.jar)
[![Join the discord](https://img.shields.io/discord/1089571852940218538?color=f9b000&label=Community&logo=Discord&logoColor=f9b000)](https://discord.gg/dmbwZrfpcQ) [ ![Download](https://img.shields.io/github/release/MAIF/otoroshi.svg) ](hhttps://github.com/MAIF/otoroshi/releases/download/v16.12.0-dev/otoroshi.jar)
@@@

@@@ div { .centered-img }
Expand All @@ -20,14 +20,14 @@ You can download the latest build of Otoroshi as a @ref:[fat jar](./install/get-
You can install and run Otoroshi with this little bash snippet

```sh
curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.11.2/otoroshi.jar'
curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.12.0-dev/otoroshi.jar'
java -jar otoroshi.jar
```

or using docker

```sh
docker run -p "8080:8080" maif/otoroshi:16.11.2
docker run -p "8080:8080" maif/otoroshi:16.12.0-dev
```

now open your browser to <a href="http://otoroshi.oto.tools:8080/" target="_blank">http://otoroshi.oto.tools:8080/</a>, **log in with the credential generated in the logs** and explore by yourself, if you want better instructions, just go to the @ref:[Quick Start](./getting-started.md) or directly to the @ref:[installation instructions](./install/get-otoroshi.md)
Expand Down
10 changes: 5 additions & 5 deletions manual/src/main/paradox/install/get-otoroshi.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ All release can be bound on the releases page of the @link:[repository](https://

```sh
# Download the latest version
wget https://github.com/MAIF/otoroshi/releases/download/v16.11.2/otoroshi-16.11.2.zip
unzip ./otoroshi-16.11.2.zip
cd otoroshi-16.11.2
wget https://github.com/MAIF/otoroshi/releases/download/v16.12.0-dev/otoroshi-16.12.0-dev.zip
unzip ./otoroshi-16.12.0-dev.zip
cd otoroshi-16.12.0-dev
```

## From jar file

```sh
# Download the latest version
wget https://github.com/MAIF/otoroshi/releases/download/v16.11.2/otoroshi.jar
wget https://github.com/MAIF/otoroshi/releases/download/v16.12.0-dev/otoroshi.jar
```

## From Docker

```sh
# Download the latest version
docker pull maif/otoroshi:16.11.2-jdk11
docker pull maif/otoroshi:16.12.0-dev-jdk11
```

## From Sources
Expand Down
4 changes: 2 additions & 2 deletions manual/src/main/paradox/snippets/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

dependencies {
compile group: 'fr.maif', name: 'otoroshi_2.12', version: '16.11.2'
compile group: 'fr.maif', name: 'otoroshi_2.12', version: '16.11.2', classifier 'assets'
compile group: 'fr.maif', name: 'otoroshi_2.12', version: '16.12.0-dev'
compile group: 'fr.maif', name: 'otoroshi_2.12', version: '16.12.0-dev', classifier 'assets'
}
4 changes: 2 additions & 2 deletions manual/src/main/paradox/snippets/build.sbt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
libraryDependencies += "fr.maif" %% "otoroshi" % "16.11.2"
libraryDependencies += "fr.maif" %% "otoroshi" % "16.11.2" classifier "assets"
libraryDependencies += "fr.maif" %% "otoroshi" % "16.12.0-dev"
libraryDependencies += "fr.maif" %% "otoroshi" % "16.12.0-dev" classifier "assets"
4 changes: 2 additions & 2 deletions manual/src/main/paradox/snippets/fetch.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// #curl
curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.11.2/otoroshi.jar'
curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.12.0-dev/otoroshi.jar'
// #curl

// #wget
wget 'https://github.com/MAIF/otoroshi/releases/download/v16.11.2/otoroshi.jar'
wget 'https://github.com/MAIF/otoroshi/releases/download/v16.12.0-dev/otoroshi.jar'
// #wget
2 changes: 1 addition & 1 deletion manual/src/main/paradox/topics/expression-language.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ You can test to get the same values than the right part by creating these follow

```sh
# Let's start by downloading the latest Otoroshi.
curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.11.2/otoroshi.jar'
curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.12.0-dev/otoroshi.jar'

# Once downloading, run Otoroshi.
java -Dotoroshi.adminPassword=password -jar otoroshi.jar
Expand Down

0 comments on commit 4ab3865

Please sign in to comment.