diff --git a/demos/basic-setup/docker-compose.yml b/demos/basic-setup/docker-compose.yml index 18e4a08afc..f4178921ad 100644 --- a/demos/basic-setup/docker-compose.yml +++ b/demos/basic-setup/docker-compose.yml @@ -36,7 +36,7 @@ services: - postgres-prod otoroshi-instance-1: - image: maif/otoroshi:16.7.0 + image: maif/otoroshi:16.7.0-dev networks: - basicsetup environment: @@ -53,7 +53,7 @@ services: - redis-slave otoroshi-instance-2: - image: maif/otoroshi:16.7.0 + image: maif/otoroshi:16.7.0-dev networks: - basicsetup environment: diff --git a/demos/service-mesh/docker-compose-manual.yml b/demos/service-mesh/docker-compose-manual.yml index fcbf968955..6096ac476d 100644 --- a/demos/service-mesh/docker-compose-manual.yml +++ b/demos/service-mesh/docker-compose-manual.yml @@ -46,7 +46,7 @@ services: - config-server otoroshi-service-1: - image: maif/otoroshi:16.7.0 + image: maif/otoroshi:16.7.0-dev networks: - mesh environment: @@ -59,7 +59,7 @@ services: - config-server otoroshi-service-2: - image: maif/otoroshi:16.7.0 + image: maif/otoroshi:16.7.0-dev networks: - mesh environment: @@ -72,7 +72,7 @@ services: - config-server otoroshi-service-3: - image: maif/otoroshi:16.7.0 + image: maif/otoroshi:16.7.0-dev networks: - mesh environment: @@ -85,7 +85,7 @@ services: - config-server otoroshi-service-frontend: - image: maif/otoroshi:16.7.0 + image: maif/otoroshi:16.7.0-dev networks: - mesh ports: @@ -99,7 +99,7 @@ services: - service-frontend otoroshi-gateway: - image: maif/otoroshi:16.7.0 + image: maif/otoroshi:16.7.0-dev networks: - mesh ports: diff --git a/demos/service-mesh/docker-compose.yml b/demos/service-mesh/docker-compose.yml index 02f756eac1..d5f3bc3a3c 100644 --- a/demos/service-mesh/docker-compose.yml +++ b/demos/service-mesh/docker-compose.yml @@ -50,7 +50,7 @@ services: ipv4_address: 172.16.239.44 otoroshi-service-1: - image: maif/otoroshi:16.7.0 + image: maif/otoroshi:16.7.0-dev networks: - mesh environment: @@ -75,7 +75,7 @@ services: ipv4_address: 172.16.239.31 otoroshi-service-2: - image: maif/otoroshi:16.7.0 + image: maif/otoroshi:16.7.0-dev networks: - mesh environment: @@ -101,7 +101,7 @@ services: ipv4_address: 172.16.239.32 otoroshi-service-3: - image: maif/otoroshi:16.7.0 + image: maif/otoroshi:16.7.0-dev networks: - mesh environment: @@ -127,7 +127,7 @@ services: ipv4_address: 172.16.239.33 otoroshi-service-frontend: - image: maif/otoroshi:16.7.0 + image: maif/otoroshi:16.7.0-dev networks: - mesh ports: @@ -155,7 +155,7 @@ services: ipv4_address: 172.16.239.34 otoroshi-gateway: - image: maif/otoroshi:16.7.0 + image: maif/otoroshi:16.7.0-dev networks: - mesh ports: diff --git a/kubernetes/helm/otoroshi/Chart.yaml b/kubernetes/helm/otoroshi/Chart.yaml index c290b9cb41..e81e7e645d 100644 --- a/kubernetes/helm/otoroshi/Chart.yaml +++ b/kubernetes/helm/otoroshi/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v3 name: otoroshi description: An Otoroshi based Kubernetes ingress controller type: application -version: 16.7.0 -appVersion: 16.7.0 +version: 16.7.0-dev +appVersion: 16.7.0-dev keywords: - otoroshi - ingress diff --git a/kubernetes/helm/otoroshi/values.yaml b/kubernetes/helm/otoroshi/values.yaml index 9386ac6f2d..ed5e498e65 100644 --- a/kubernetes/helm/otoroshi/values.yaml +++ b/kubernetes/helm/otoroshi/values.yaml @@ -14,7 +14,7 @@ serviceAccount: image: name: maif/otoroshi - tag: 16.7.0 + tag: 16.7.0-dev pullPolicy: IfNotPresent https: 8443 http: 8080 diff --git a/kubernetes/kustomize/overlays/cluster-baremetal-daemonset/deployment.yaml b/kubernetes/kustomize/overlays/cluster-baremetal-daemonset/deployment.yaml index 393acbddb7..e03f8589c0 100644 --- a/kubernetes/kustomize/overlays/cluster-baremetal-daemonset/deployment.yaml +++ b/kubernetes/kustomize/overlays/cluster-baremetal-daemonset/deployment.yaml @@ -34,7 +34,7 @@ spec: hostNetwork: false restartPolicy: Always containers: - - image: maif/otoroshi:16.7.0-jdk11 + - image: maif/otoroshi:16.7.0-dev-jdk11 imagePullPolicy: IfNotPresent name: otoroshi-leader ports: diff --git a/kubernetes/kustomize/overlays/cluster-baremetal/deployment.yaml b/kubernetes/kustomize/overlays/cluster-baremetal/deployment.yaml index 6dfbeffd3b..b5c81a5b8b 100644 --- a/kubernetes/kustomize/overlays/cluster-baremetal/deployment.yaml +++ b/kubernetes/kustomize/overlays/cluster-baremetal/deployment.yaml @@ -23,7 +23,7 @@ spec: hostNetwork: false restartPolicy: Always containers: - - image: maif/otoroshi:16.7.0-jdk11 + - image: maif/otoroshi:16.7.0-dev-jdk11 imagePullPolicy: IfNotPresent name: otoroshi-leader ports: diff --git a/kubernetes/kustomize/overlays/cluster/deployment.yaml b/kubernetes/kustomize/overlays/cluster/deployment.yaml index 4738662d08..3daaf79134 100644 --- a/kubernetes/kustomize/overlays/cluster/deployment.yaml +++ b/kubernetes/kustomize/overlays/cluster/deployment.yaml @@ -23,7 +23,7 @@ spec: hostNetwork: false restartPolicy: Always containers: - - image: maif/otoroshi:16.7.0-jdk11 + - image: maif/otoroshi:16.7.0-dev-jdk11 imagePullPolicy: IfNotPresent name: otoroshi-leader ports: diff --git a/kubernetes/kustomize/overlays/simple-baremetal-daemonset/deployment.yaml b/kubernetes/kustomize/overlays/simple-baremetal-daemonset/deployment.yaml index 6350005179..6b72183828 100644 --- a/kubernetes/kustomize/overlays/simple-baremetal-daemonset/deployment.yaml +++ b/kubernetes/kustomize/overlays/simple-baremetal-daemonset/deployment.yaml @@ -28,7 +28,7 @@ spec: restartPolicy: Always hostNetwork: false containers: - - image: maif/otoroshi:16.7.0-jdk11 + - image: maif/otoroshi:16.7.0-dev-jdk11 imagePullPolicy: IfNotPresent name: otoroshi ports: diff --git a/kubernetes/kustomize/overlays/simple-baremetal/deployment.yaml b/kubernetes/kustomize/overlays/simple-baremetal/deployment.yaml index 40ca64281c..a4db802dd6 100644 --- a/kubernetes/kustomize/overlays/simple-baremetal/deployment.yaml +++ b/kubernetes/kustomize/overlays/simple-baremetal/deployment.yaml @@ -21,7 +21,7 @@ spec: terminationGracePeriodSeconds: 60 hostNetwork: false containers: - - image: maif/otoroshi:16.7.0-jdk11 + - image: maif/otoroshi:16.7.0-dev-jdk11 imagePullPolicy: IfNotPresent name: otoroshi ports: diff --git a/kubernetes/kustomize/overlays/simple/deployment.yaml b/kubernetes/kustomize/overlays/simple/deployment.yaml index b44f036fa3..5b79c6f925 100644 --- a/kubernetes/kustomize/overlays/simple/deployment.yaml +++ b/kubernetes/kustomize/overlays/simple/deployment.yaml @@ -21,7 +21,7 @@ spec: terminationGracePeriodSeconds: 60 hostNetwork: false containers: - - image: maif/otoroshi:16.7.0-jdk11 + - image: maif/otoroshi:16.7.0-dev-jdk11 imagePullPolicy: IfNotPresent name: otoroshi ports: diff --git a/manual/build.sbt b/manual/build.sbt index 811034b063..3c2feb985c 100644 --- a/manual/build.sbt +++ b/manual/build.sbt @@ -1,6 +1,6 @@ name := """otoroshi-manual""" organization := "fr.maif" -version := "16.7.0" +version := "16.7.0-dev" scalaVersion := "2.13.1" lazy val docs = (project in file(".")) diff --git a/manual/src/main/paradox/code/openapi.json b/manual/src/main/paradox/code/openapi.json index f1ed1559f8..bb95a00d86 100644 --- a/manual/src/main/paradox/code/openapi.json +++ b/manual/src/main/paradox/code/openapi.json @@ -3,7 +3,7 @@ "info" : { "title" : "Otoroshi Admin API", "description" : "Admin API of the Otoroshi reverse proxy", - "version" : "16.7.0", + "version" : "16.7.0-dev", "contact" : { "name" : "Otoroshi Team", "email" : "oss@maif.fr" diff --git a/manual/src/main/paradox/deploy/kubernetes.md b/manual/src/main/paradox/deploy/kubernetes.md index e31fe9a709..e17242da92 100644 --- a/manual/src/main/paradox/deploy/kubernetes.md +++ b/manual/src/main/paradox/deploy/kubernetes.md @@ -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.7.0 +- github.com/MAIF/otoroshi/kubernetes/kustomize/overlays/simple/?ref=v16.7.0-dev ``` Then deploy it with `kubectl apply -k ./overlays/myoverlay`. @@ -87,7 +87,7 @@ spec: terminationGracePeriodSeconds: 60 hostNetwork: false containers: - - image: maif/otoroshi:16.7.0 + - image: maif/otoroshi:16.7.0-dev imagePullPolicy: IfNotPresent name: otoroshi args: ['-Dconfig.file=/usr/app/otoroshi/conf/oto.conf'] diff --git a/manual/src/main/paradox/getting-started.md b/manual/src/main/paradox/getting-started.md index ed4c1f91d6..e0cc65dd27 100644 --- a/manual/src/main/paradox/getting-started.md +++ b/manual/src/main/paradox/getting-started.md @@ -5,7 +5,7 @@ Download the latest jar of Otoroshi ```sh -curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.7.0/otoroshi.jar' +curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.7.0-dev/otoroshi.jar' ``` Once downloading, run Otoroshi. diff --git a/manual/src/main/paradox/how-to-s/import-export-otoroshi-datastore.md b/manual/src/main/paradox/how-to-s/import-export-otoroshi-datastore.md index 48fb8c961b..5a1d753e5f 100644 --- a/manual/src/main/paradox/how-to-s/import-export-otoroshi-datastore.md +++ b/manual/src/main/paradox/how-to-s/import-export-otoroshi-datastore.md @@ -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.7.0/otoroshi.jar' +curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.7.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. diff --git a/manual/src/main/paradox/how-to-s/setup-otoroshi-cluster.md b/manual/src/main/paradox/how-to-s/setup-otoroshi-cluster.md index d93f5b5464..084da7aaa9 100644 --- a/manual/src/main/paradox/how-to-s/setup-otoroshi-cluster.md +++ b/manual/src/main/paradox/how-to-s/setup-otoroshi-cluster.md @@ -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.7.0/otoroshi.jar' +curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.7.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. diff --git a/manual/src/main/paradox/includes/fetch-and-start.md b/manual/src/main/paradox/includes/fetch-and-start.md index 77e782ee04..56bcdd5a15 100644 --- a/manual/src/main/paradox/includes/fetch-and-start.md +++ b/manual/src/main/paradox/includes/fetch-and-start.md @@ -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.7.0/otoroshi.jar' +curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.7.0-dev/otoroshi.jar' ``` then you can run start Otoroshi : diff --git a/manual/src/main/paradox/includes/initialize.md b/manual/src/main/paradox/includes/initialize.md index 270b0a04fa..0ffcda6dc5 100644 --- a/manual/src/main/paradox/includes/initialize.md +++ b/manual/src/main/paradox/includes/initialize.md @@ -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.7.0/otoroshi.jar' +curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.7.0-dev/otoroshi.jar' ``` then you can run start Otoroshi : diff --git a/manual/src/main/paradox/index.md b/manual/src/main/paradox/index.md index 5d91a12585..d4d3a66bae 100644 --- a/manual/src/main/paradox/index.md +++ b/manual/src/main/paradox/index.md @@ -6,7 +6,7 @@ > *The Otoroshi 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.7.0/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.7.0-dev/otoroshi.jar) @@@ @@@ div { .centered-img } @@ -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.7.0/otoroshi.jar' +curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.7.0-dev/otoroshi.jar' java -jar otoroshi.jar ``` or using docker ```sh -docker run -p "8080:8080" maif/otoroshi:16.7.0 +docker run -p "8080:8080" maif/otoroshi:16.7.0-dev ``` now open your browser to http://otoroshi.oto.tools:8080/, **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) diff --git a/manual/src/main/paradox/install/get-otoroshi.md b/manual/src/main/paradox/install/get-otoroshi.md index 5221ac182f..1799c041d2 100644 --- a/manual/src/main/paradox/install/get-otoroshi.md +++ b/manual/src/main/paradox/install/get-otoroshi.md @@ -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.7.0/otoroshi-16.7.0.zip -unzip ./otoroshi-16.7.0.zip -cd otoroshi-16.7.0 +wget https://github.com/MAIF/otoroshi/releases/download/v16.7.0-dev/otoroshi-16.7.0-dev.zip +unzip ./otoroshi-16.7.0-dev.zip +cd otoroshi-16.7.0-dev ``` ## From jar file ```sh # Download the latest version -wget https://github.com/MAIF/otoroshi/releases/download/v16.7.0/otoroshi.jar +wget https://github.com/MAIF/otoroshi/releases/download/v16.7.0-dev/otoroshi.jar ``` ## From Docker ```sh # Download the latest version -docker pull maif/otoroshi:16.7.0-jdk11 +docker pull maif/otoroshi:16.7.0-dev-jdk11 ``` ## From Sources diff --git a/manual/src/main/paradox/snippets/build.gradle b/manual/src/main/paradox/snippets/build.gradle index e8f8fea1d1..1ba6b8cecb 100644 --- a/manual/src/main/paradox/snippets/build.gradle +++ b/manual/src/main/paradox/snippets/build.gradle @@ -1,5 +1,5 @@ dependencies { - compile group: 'fr.maif', name: 'otoroshi_2.12', version: '16.7.0' - compile group: 'fr.maif', name: 'otoroshi_2.12', version: '16.7.0', classifier 'assets' + compile group: 'fr.maif', name: 'otoroshi_2.12', version: '16.7.0-dev' + compile group: 'fr.maif', name: 'otoroshi_2.12', version: '16.7.0-dev', classifier 'assets' } diff --git a/manual/src/main/paradox/snippets/build.sbt b/manual/src/main/paradox/snippets/build.sbt index 852bb3e7cd..c7e1ef5211 100644 --- a/manual/src/main/paradox/snippets/build.sbt +++ b/manual/src/main/paradox/snippets/build.sbt @@ -1,2 +1,2 @@ -libraryDependencies += "fr.maif" %% "otoroshi" % "16.7.0" -libraryDependencies += "fr.maif" %% "otoroshi" % "16.7.0" classifier "assets" \ No newline at end of file +libraryDependencies += "fr.maif" %% "otoroshi" % "16.7.0-dev" +libraryDependencies += "fr.maif" %% "otoroshi" % "16.7.0-dev" classifier "assets" \ No newline at end of file diff --git a/manual/src/main/paradox/snippets/fetch.sh b/manual/src/main/paradox/snippets/fetch.sh index c5fffe6f30..f1a2086459 100644 --- a/manual/src/main/paradox/snippets/fetch.sh +++ b/manual/src/main/paradox/snippets/fetch.sh @@ -1,7 +1,7 @@ // #curl -curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.7.0/otoroshi.jar' +curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.7.0-dev/otoroshi.jar' // #curl // #wget -wget 'https://github.com/MAIF/otoroshi/releases/download/v16.7.0/otoroshi.jar' +wget 'https://github.com/MAIF/otoroshi/releases/download/v16.7.0-dev/otoroshi.jar' // #wget diff --git a/manual/src/main/paradox/topics/expression-language.md b/manual/src/main/paradox/topics/expression-language.md index 19757209de..1e07d5f7b6 100644 --- a/manual/src/main/paradox/topics/expression-language.md +++ b/manual/src/main/paradox/topics/expression-language.md @@ -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.7.0/otoroshi.jar' +curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v16.7.0-dev/otoroshi.jar' # Once downloading, run Otoroshi. java -Dotoroshi.adminPassword=password -jar otoroshi.jar diff --git a/otoroshi/app/controllers/SwaggerController.scala b/otoroshi/app/controllers/SwaggerController.scala index 3027d61a3f..54fbfa837d 100644 --- a/otoroshi/app/controllers/SwaggerController.scala +++ b/otoroshi/app/controllers/SwaggerController.scala @@ -2886,7 +2886,7 @@ class SwaggerController(cc: ControllerComponents, assetsBuilder: AssetsBuilder)( Json.obj( "openapi" -> "3.0.0", "info" -> Json.obj( - "version" -> "16.7.0", + "version" -> "16.7.0-dev", "title" -> "Otoroshi Admin API", "description" -> "Admin API of the Otoroshi reverse proxy", "contact" -> Json.obj( diff --git a/otoroshi/app/env/Env.scala b/otoroshi/app/env/Env.scala index a5bd83e040..568abd8b70 100644 --- a/otoroshi/app/env/Env.scala +++ b/otoroshi/app/env/Env.scala @@ -1157,7 +1157,7 @@ class Env( name = backofficeRoute.name ) - lazy val otoroshiVersion = "16.7.0" + lazy val otoroshiVersion = "16.7.0-dev" lazy val otoroshiVersionSem = Version(otoroshiVersion) lazy val checkForUpdates = configuration.getOptionalWithFileSupport[Boolean]("app.checkForUpdates").getOrElse(true) diff --git a/otoroshi/app/openapi/openapi.scala b/otoroshi/app/openapi/openapi.scala index d4f76d7e80..6f3cc4d219 100644 --- a/otoroshi/app/openapi/openapi.scala +++ b/otoroshi/app/openapi/openapi.scala @@ -1210,7 +1210,7 @@ class OpenApiGenerator( "info" -> Json.obj( "title" -> "Otoroshi Admin API", "description" -> "Admin API of the Otoroshi reverse proxy", - "version" -> "16.7.0", + "version" -> "16.7.0-dev", "contact" -> Json.obj( "name" -> "Otoroshi Team", "email" -> "oss@maif.fr" diff --git a/otoroshi/build.sbt b/otoroshi/build.sbt index d065eecc23..757ff4517a 100644 --- a/otoroshi/build.sbt +++ b/otoroshi/build.sbt @@ -2,7 +2,7 @@ import xerial.sbt.Sonatype._ name := """otoroshi""" organization := "fr.maif" -version := "16.7.0" +version := "16.7.0-dev" scalaVersion := scalaLangVersion inThisBuild( diff --git a/tools/tcp-udp-tunnel-client/client.js b/tools/tcp-udp-tunnel-client/client.js index 04510684f1..a7c2909542 100644 --- a/tools/tcp-udp-tunnel-client/client.js +++ b/tools/tcp-udp-tunnel-client/client.js @@ -614,7 +614,7 @@ function ProxyServer(options, optionalConfigFile) { function displayHeader() { console.log('') - console.log('Otoroshi TCP tunnel CLI, version 16.7.0'.yellow) + console.log('Otoroshi TCP tunnel CLI, version 16.7.0-dev'.yellow) console.log('') }