From 09ba16114883c8e592007aee5e02dd12c4f29b4d Mon Sep 17 00:00:00 2001 From: Mathieu ANCELIN Date: Fri, 17 Jan 2020 17:10:16 +0100 Subject: [PATCH] Update version to 1.4.19-dev --- clients/cli/Cargo.toml | 2 +- clients/tcp-udp-tunnel-client/client.js | 2 +- demos/basic-setup/docker-compose.yml | 4 ++-- demos/service-mesh/docker-compose-manual.yml | 10 +++++----- demos/service-mesh/docker-compose.yml | 10 +++++----- docker/build/build.sh | 18 +++++++++--------- docs/index.html | 2 +- manual/build.sbt | 2 +- manual/src/main/paradox/code/swagger.json | 2 +- .../src/main/paradox/getotoroshi/fromdocker.md | 12 ++++++------ manual/src/main/paradox/index.md | 8 ++++---- manual/src/main/paradox/quickstart.md | 6 +++--- manual/src/main/paradox/snippets/build.gradle | 4 ++-- manual/src/main/paradox/snippets/build.sbt | 4 ++-- .../app/controllers/SwaggerController.scala | 2 +- otoroshi/app/env/Env.scala | 2 +- otoroshi/build.sbt | 2 +- readme.md | 2 +- scripts/upload.sh | 2 +- scripts/wrk.sh | 4 ++-- 20 files changed, 50 insertions(+), 50 deletions(-) diff --git a/clients/cli/Cargo.toml b/clients/cli/Cargo.toml index 18ea427bfa..c76b5c3f4b 100644 --- a/clients/cli/Cargo.toml +++ b/clients/cli/Cargo.toml @@ -3,7 +3,7 @@ authors = ["Mathieu "] license = "ASL-2.0" name = "otoroshi-cli" readme = "readme.md" -version = "1.4.18-dev" +version = "1.4.18" [[bin]] name = "otoroshicli" diff --git a/clients/tcp-udp-tunnel-client/client.js b/clients/tcp-udp-tunnel-client/client.js index a308f16b1b..cabd9da86a 100644 --- a/clients/tcp-udp-tunnel-client/client.js +++ b/clients/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 1.4.18-dev'.yellow) + console.log('Otoroshi TCP tunnel CLI, version 1.4.18'.yellow) console.log('') } diff --git a/demos/basic-setup/docker-compose.yml b/demos/basic-setup/docker-compose.yml index a3415e9d15..0e976cae4b 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:1.4.18-dev + image: maif/otoroshi:1.4.18 networks: - basicsetup environment: @@ -53,7 +53,7 @@ services: - redis-slave otoroshi-instance-2: - image: maif/otoroshi:1.4.18-dev + image: maif/otoroshi:1.4.18 networks: - basicsetup environment: diff --git a/demos/service-mesh/docker-compose-manual.yml b/demos/service-mesh/docker-compose-manual.yml index 82e8125f50..163958e551 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:1.4.18-dev + image: maif/otoroshi:1.4.18 networks: - mesh environment: @@ -59,7 +59,7 @@ services: - config-server otoroshi-service-2: - image: maif/otoroshi:1.4.18-dev + image: maif/otoroshi:1.4.18 networks: - mesh environment: @@ -72,7 +72,7 @@ services: - config-server otoroshi-service-3: - image: maif/otoroshi:1.4.18-dev + image: maif/otoroshi:1.4.18 networks: - mesh environment: @@ -85,7 +85,7 @@ services: - config-server otoroshi-service-frontend: - image: maif/otoroshi:1.4.18-dev + image: maif/otoroshi:1.4.18 networks: - mesh ports: @@ -99,7 +99,7 @@ services: - service-frontend otoroshi-gateway: - image: maif/otoroshi:1.4.18-dev + image: maif/otoroshi:1.4.18 networks: - mesh ports: diff --git a/demos/service-mesh/docker-compose.yml b/demos/service-mesh/docker-compose.yml index 7ae93a7277..61793fe243 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:1.4.18-dev + image: maif/otoroshi:1.4.18 networks: - mesh environment: @@ -75,7 +75,7 @@ services: ipv4_address: 172.16.239.31 otoroshi-service-2: - image: maif/otoroshi:1.4.18-dev + image: maif/otoroshi:1.4.18 networks: - mesh environment: @@ -101,7 +101,7 @@ services: ipv4_address: 172.16.239.32 otoroshi-service-3: - image: maif/otoroshi:1.4.18-dev + image: maif/otoroshi:1.4.18 networks: - mesh environment: @@ -127,7 +127,7 @@ services: ipv4_address: 172.16.239.33 otoroshi-service-frontend: - image: maif/otoroshi:1.4.18-dev + image: maif/otoroshi:1.4.18 networks: - mesh ports: @@ -155,7 +155,7 @@ services: ipv4_address: 172.16.239.34 otoroshi-gateway: - image: maif/otoroshi:1.4.18-dev + image: maif/otoroshi:1.4.18 networks: - mesh ports: diff --git a/docker/build/build.sh b/docker/build/build.sh index 3f5aa5733e..50b07696b7 100644 --- a/docker/build/build.sh +++ b/docker/build/build.sh @@ -17,11 +17,11 @@ prepare_build () { sbt dist sbt assembly cd $LOCATION - cp ../../otoroshi/target/universal/otoroshi-1.4.18-dev.zip ./otoroshi-dist.zip + cp ../../otoroshi/target/universal/otoroshi-1.4.18.zip ./otoroshi-dist.zip cp ../../otoroshi/target/scala-2.12/otoroshi.jar ./otoroshi.jar fi unzip otoroshi-dist.zip - mv otoroshi-1.4.18-dev otoroshi + mv otoroshi-1.4.18 otoroshi rm -rf otoroshi-dist.zip chmod +x ./otoroshi/bin/otoroshi mkdir -p ./otoroshi/imports @@ -152,21 +152,21 @@ case "${1}" in ;; build-and-push-snapshot) NBR=`date +%s` - echo "Will build version 1.4.18-dev-$NBR" - cp ../../otoroshi/target/universal/otoroshi-1.4.18-dev.zip otoroshi-dist.zip + echo "Will build version 1.4.18-$NBR" + cp ../../otoroshi/target/universal/otoroshi-1.4.18.zip otoroshi-dist.zip prepare_build docker build --no-cache -f ./Dockerfile-jdk11 -t otoroshi . - docker tag otoroshi "maif/otoroshi:1.4.18-dev-$NBR" + docker tag otoroshi "maif/otoroshi:1.4.18-$NBR" cleanup - docker push "maif/otoroshi:1.4.18-dev-$NBR" + docker push "maif/otoroshi:1.4.18-$NBR" ;; build-snapshot) NBR=`date +%s` - echo "Will build version 1.4.18-dev-$NBR" - cp ../../otoroshi/target/universal/otoroshi-1.4.18-dev.zip otoroshi-dist.zip + echo "Will build version 1.4.18-$NBR" + cp ../../otoroshi/target/universal/otoroshi-1.4.18.zip otoroshi-dist.zip prepare_build docker build --no-cache -f ./Dockerfile-jdk11 -t otoroshi . - docker tag otoroshi "maif/otoroshi:1.4.18-dev-$NBR" + docker tag otoroshi "maif/otoroshi:1.4.18-$NBR" cleanup ;; *) diff --git a/docs/index.html b/docs/index.html index abd129199e..909f5a035b 100644 --- a/docs/index.html +++ b/docs/index.html @@ -109,7 +109,7 @@

high productivity

- +

DOWNLOAD

diff --git a/manual/build.sbt b/manual/build.sbt index 7eac0be7aa..2ced6bb929 100644 --- a/manual/build.sbt +++ b/manual/build.sbt @@ -1,6 +1,6 @@ name := """otoroshi-manual""" organization := "fr.maif" -version := "1.4.18-dev" +version := "1.4.18" scalaVersion := "2.12.4" lazy val docs = (project in file(".")) diff --git a/manual/src/main/paradox/code/swagger.json b/manual/src/main/paradox/code/swagger.json index 26c1501b03..37e48d0916 100644 --- a/manual/src/main/paradox/code/swagger.json +++ b/manual/src/main/paradox/code/swagger.json @@ -1,7 +1,7 @@ { "swagger" : "2.0", "info" : { - "version" : "1.4.18-dev", + "version" : "1.4.18", "title" : "Otoroshi Admin API", "description" : "Admin API of the Otoroshi reverse proxy", "contact" : { diff --git a/manual/src/main/paradox/getotoroshi/fromdocker.md b/manual/src/main/paradox/getotoroshi/fromdocker.md index 2a02159920..f4d7e94cdd 100644 --- a/manual/src/main/paradox/getotoroshi/fromdocker.md +++ b/manual/src/main/paradox/getotoroshi/fromdocker.md @@ -5,17 +5,17 @@ If you're a Docker aficionado, Otoroshi is provided as a Docker image that your first, fetch the last Docker image of Otoroshi : ```sh -docker pull maif/otoroshi:1.4.18-dev +docker pull maif/otoroshi:1.4.18 # or docker pull maif/otoroshi:latest # or -docker pull maif/otoroshi:jdk8-1.4.18-dev +docker pull maif/otoroshi:jdk8-1.4.18 # or -docker pull maif/otoroshi:jdk11-1.4.18-dev +docker pull maif/otoroshi:jdk11-1.4.18 # or -docker pull maif/otoroshi:jdk12-1.4.18-dev +docker pull maif/otoroshi:jdk12-1.4.18 # or -docker pull maif/otoroshi:jdk13-1.4.18-dev +docker pull maif/otoroshi:jdk13-1.4.18 # or -docker pull maif/otoroshi:jdk14-1.4.18-dev +docker pull maif/otoroshi:jdk14-1.4.18 ``` \ No newline at end of file diff --git a/manual/src/main/paradox/index.md b/manual/src/main/paradox/index.md index 8667dcf8c9..71a5a79f85 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 } -[![Build Status](https://travis-ci.org/MAIF/otoroshi.svg?branch=master)](https://travis-ci.org/MAIF/otoroshi) [![Join the chat at https://gitter.im/MAIF/otoroshi](https://badges.gitter.im/MAIF/otoroshi.svg)](https://gitter.im/MAIF/otoroshi?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [ ![Download](https://img.shields.io/github/release/MAIF/otoroshi.svg) ](hhttps://github.com/MAIF/otoroshi/releases/download/v1.4.18-dev/otoroshi.jar) +[![Build Status](https://travis-ci.org/MAIF/otoroshi.svg?branch=master)](https://travis-ci.org/MAIF/otoroshi) [![Join the chat at https://gitter.im/MAIF/otoroshi](https://badges.gitter.im/MAIF/otoroshi.svg)](https://gitter.im/MAIF/otoroshi?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [ ![Download](https://img.shields.io/github/release/MAIF/otoroshi.svg) ](hhttps://github.com/MAIF/otoroshi/releases/download/v1.4.18/otoroshi.jar) @@@ @@@ div { .centered-img } @@ -15,19 +15,19 @@ ## Installation -You can download the latest build of Otoroshi as a [fat jar](https://github.com/MAIF/otoroshi/releases/download/v1.4.18-dev/otoroshi.jar), as a [zip package](https://github.com/MAIF/otoroshi/releases/download/v1.4.18-dev/otoroshi-dist.zip) or as a @ref:[docker image](./getotoroshi/fromdocker.md). +You can download the latest build of Otoroshi as a [fat jar](https://github.com/MAIF/otoroshi/releases/download/v1.4.18/otoroshi.jar), as a [zip package](https://github.com/MAIF/otoroshi/releases/download/v1.4.18/otoroshi-dist.zip) or as a @ref:[docker image](./getotoroshi/fromdocker.md). You can install and run Otoroshi with this little bash snippet ```sh -curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v1.4.18-dev/otoroshi.jar' +curl -L -o otoroshi.jar 'https://github.com/MAIF/otoroshi/releases/download/v1.4.18/otoroshi.jar' java -jar otoroshi.jar ``` or using docker ```sh -docker run -p "8080:8080" maif/otoroshi:1.4.18-dev +docker run -p "8080:8080" maif/otoroshi:1.4.18 ``` 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](./quickstart.md) or directly to the @ref:[installation instructions](./getotoroshi/index.md) diff --git a/manual/src/main/paradox/quickstart.md b/manual/src/main/paradox/quickstart.md index 80f7641086..d79e5474bb 100644 --- a/manual/src/main/paradox/quickstart.md +++ b/manual/src/main/paradox/quickstart.md @@ -29,8 +29,8 @@ As Otoroshi uses Otoroshi to serve its own admin UI and admin API, you won't be ## Now some sh :) ```sh -curl -L -o otoroshi.jar https://github.com/MAIF/otoroshi/releases/download/v1.4.18-dev/otoroshi.jar -curl -L -o otoroshicli https://github.com/MAIF/otoroshi/releases/download/v1.4.18-dev/linux-otoroshicli +curl -L -o otoroshi.jar https://github.com/MAIF/otoroshi/releases/download/v1.4.18/otoroshi.jar +curl -L -o otoroshicli https://github.com/MAIF/otoroshi/releases/download/v1.4.18/linux-otoroshicli chmod +x otoroshicli @@ -107,7 +107,7 @@ If you want to use Docker, just follow these instructions export OTOROSHI_PORT=8080 export LOCAL_IP_ADDRESS=999.999.999.999 # use your real local ip address here -curl -L -o otoroshicli https://github.com/MAIF/otoroshi/releases/download/v1.4.18-dev/linux-otoroshicli +curl -L -o otoroshicli https://github.com/MAIF/otoroshi/releases/download/v1.4.18/linux-otoroshicli chmod +x otoroshicli diff --git a/manual/src/main/paradox/snippets/build.gradle b/manual/src/main/paradox/snippets/build.gradle index 96f96bfc29..93e02b6120 100644 --- a/manual/src/main/paradox/snippets/build.gradle +++ b/manual/src/main/paradox/snippets/build.gradle @@ -3,6 +3,6 @@ repositories { } dependencies { - compile group: 'fr.maif.otoroshi', name: 'otoroshi_2.12', version: '1.4.18-dev' - compile group: 'fr.maif.otoroshi', name: 'otoroshi_2.12', version: '1.4.18-dev', classifier 'assets' + compile group: 'fr.maif.otoroshi', name: 'otoroshi_2.12', version: '1.4.18' + compile group: 'fr.maif.otoroshi', name: 'otoroshi_2.12', version: '1.4.18', classifier 'assets' } diff --git a/manual/src/main/paradox/snippets/build.sbt b/manual/src/main/paradox/snippets/build.sbt index 6896adcafb..34cf057b52 100644 --- a/manual/src/main/paradox/snippets/build.sbt +++ b/manual/src/main/paradox/snippets/build.sbt @@ -1,4 +1,4 @@ resolvers += Resolver.bintrayRepo("maif", "maven") -libraryDependencies += "fr.maif.otoroshi" %% "otoroshi" % "1.4.18-dev" -libraryDependencies += "fr.maif.otoroshi" %% "otoroshi" % "1.4.18-dev" classifier "assets" \ No newline at end of file +libraryDependencies += "fr.maif.otoroshi" %% "otoroshi" % "1.4.18" +libraryDependencies += "fr.maif.otoroshi" %% "otoroshi" % "1.4.18" classifier "assets" \ No newline at end of file diff --git a/otoroshi/app/controllers/SwaggerController.scala b/otoroshi/app/controllers/SwaggerController.scala index 24529b3d58..2648f5380c 100644 --- a/otoroshi/app/controllers/SwaggerController.scala +++ b/otoroshi/app/controllers/SwaggerController.scala @@ -2342,7 +2342,7 @@ class SwaggerController(cc: ControllerComponents)(implicit env: Env) extends Abs Json.obj( "swagger" -> "2.0", "info" -> Json.obj( - "version" -> "1.4.18-dev", + "version" -> "1.4.18", "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 304d3eb3c0..f0cde2dc2d 100644 --- a/otoroshi/app/env/Env.scala +++ b/otoroshi/app/env/Env.scala @@ -596,7 +596,7 @@ class Env(val configuration: Configuration, stripPath = true ) - lazy val otoroshiVersion = "1.4.18-dev" + lazy val otoroshiVersion = "1.4.18" lazy val latestVersionHolder = new AtomicReference[JsValue](JsNull) lazy val checkForUpdates = configuration.getOptional[Boolean]("app.checkForUpdates").getOrElse(true) diff --git a/otoroshi/build.sbt b/otoroshi/build.sbt index 5dc30c0a9e..d36ce4b7fc 100644 --- a/otoroshi/build.sbt +++ b/otoroshi/build.sbt @@ -1,6 +1,6 @@ name := """otoroshi""" organization := "fr.maif.otoroshi" -version := "1.4.18-dev" +version := "1.4.18" scalaVersion := "2.12.8" lazy val root = (project in file(".")) diff --git a/readme.md b/readme.md index 48a10d095d..f68e9156c9 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ # Otoroshi -[![Build Status](https://travis-ci.org/MAIF/otoroshi.svg?branch=master)](https://travis-ci.org/MAIF/otoroshi) [![Join the chat at https://gitter.im/MAIF/otoroshi](https://badges.gitter.im/MAIF/otoroshi.svg)](https://gitter.im/MAIF/otoroshi?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [ ![Download](https://img.shields.io/github/release/MAIF/otoroshi.svg) ](https://github.com/MAIF/otoroshi/releases/download/v1.4.17/otoroshi.jar) +[![Build Status](https://travis-ci.org/MAIF/otoroshi.svg?branch=master)](https://travis-ci.org/MAIF/otoroshi) [![Join the chat at https://gitter.im/MAIF/otoroshi](https://badges.gitter.im/MAIF/otoroshi.svg)](https://gitter.im/MAIF/otoroshi?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [ ![Download](https://img.shields.io/github/release/MAIF/otoroshi.svg) ](https://github.com/MAIF/otoroshi/releases/download/v1.4.18/otoroshi.jar) **Otoroshi** is a layer of lightweight api management on top of a modern http reverse proxy written in Scala and developped by the MAIF OSS team that can handle all the calls to and between your microservices without service locator and let you change configuration dynamicaly at runtime. diff --git a/scripts/upload.sh b/scripts/upload.sh index d364f8d94a..6b2b4772e8 100755 --- a/scripts/upload.sh +++ b/scripts/upload.sh @@ -7,6 +7,6 @@ then then echo "Uploading otoroshi.jar" curl -T ./otoroshi/target/scala-2.12/otoroshi.jar -umathieuancelin:$BINTRAY_API_KEY -H 'X-Bintray-Publish: 1' -H 'X-Bintray-Override: 1' -H 'X-Bintray-Version: snapshot' -H 'X-Bintray-Package: otoroshi.jar' https://api.bintray.com/content/maif/binaries/otoroshi.jar/snapshot/otoroshi.jar - curl -T ./otoroshi/target/universal/otoroshi-1.4.18-dev.zip -umathieuancelin:$BINTRAY_API_KEY -H 'X-Bintray-Publish: 1' -H 'X-Bintray-Override: 1' -H 'X-Bintray-Version: snapshot' -H 'X-Bintray-Package: otoroshi-dist' https://api.bintray.com/content/maif/binaries/otoroshi-dist/snapshot/otoroshi-dist.zip + curl -T ./otoroshi/target/universal/otoroshi-1.4.18.zip -umathieuancelin:$BINTRAY_API_KEY -H 'X-Bintray-Publish: 1' -H 'X-Bintray-Override: 1' -H 'X-Bintray-Version: snapshot' -H 'X-Bintray-Package: otoroshi-dist' https://api.bintray.com/content/maif/binaries/otoroshi-dist/snapshot/otoroshi-dist.zip fi fi diff --git a/scripts/wrk.sh b/scripts/wrk.sh index 49316b73aa..cc17ccaf2d 100644 --- a/scripts/wrk.sh +++ b/scripts/wrk.sh @@ -45,7 +45,7 @@ cd wrk_test LOCATION=`pwd` if [ ! -f "$LOCATION/otoroshi.jar" ]; then - wget -q --show-progress 'https://github.com/MAIF/otoroshi/releases/download/v1.4.18-dev/otoroshi.jar' + wget -q --show-progress 'https://github.com/MAIF/otoroshi/releases/download/v1.4.18/otoroshi.jar' fi if [ ! -f "$LOCATION/otoroshicli.toml" ]; then @@ -53,7 +53,7 @@ if [ ! -f "$LOCATION/otoroshicli.toml" ]; then fi if [ ! -f "$LOCATION/otoroshicli" ]; then - wget -q --show-progress https://github.com/MAIF/otoroshi/releases/download/v1.4.18-dev/otoroshi.jar/linux-otoroshicli + wget -q --show-progress https://github.com/MAIF/otoroshi/releases/download/v1.4.18/otoroshi.jar/linux-otoroshicli fi if [ ! -f "$LOCATION/traefik_darwin-amd64" ]; then