From 64037ee59f23d198bb6d6cffb10395b7b6a26a23 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Sun, 1 Apr 2018 00:52:09 +0800
Subject: [PATCH] update docker-related filee to ues jdk8

---
 docker-entrypoint.sh | 10 +++++-----
 run-in-docker.sh     |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index ca6b8d4e3614..902d5a0d07c5 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -3,18 +3,18 @@
 set -euo pipefail
 
 # GEN_DIR allows to share the entrypoint between Dockerfile and run-in-docker.sh (backward compatible)
-GEN_DIR=${GEN_DIR:-/opt/swagger-codegen}
+GEN_DIR=${GEN_DIR:-/opt/openapi-generator}
 JAVA_OPTS=${JAVA_OPTS:-"-Xmx1024M -DloggerPath=conf/log4j.properties"}
 
-cli="${GEN_DIR}/modules/swagger-codegen-cli"
-codegen="${cli}/target/swagger-codegen-cli.jar"
-cmdsrc="${cli}/src/main/java/io/swagger/codegen/cmd"
+cli="${GEN_DIR}/modules/openapi-generator-cli"
+codegen="${cli}/target/openapi-generator-cli.jar"
+cmdsrc="${cli}/src/main/java/org/openapitools/codegen/cmd"
 
 pattern="@Command(name = \"$1\""
 if expr "x$1" : 'x[a-z][a-z-]*$' > /dev/null && fgrep -qe "$pattern" "$cmdsrc"/*.java || expr "$1" = 'help' > /dev/null; then
     # If ${GEN_DIR} has been mapped elsewhere from default, and that location has not been built
     if [[ ! -f "${codegen}" ]]; then
-        (cd "${GEN_DIR}" && exec mvn -am -pl "modules/swagger-codegen-cli" -Duser.home=$(dirname MAVEN_CONFIG) package)
+        (cd "${GEN_DIR}" && exec mvn -am -pl "modules/openapi-generator-cli" -Duser.home=$(dirname MAVEN_CONFIG) package)
     fi
     command=$1
     shift
diff --git a/run-in-docker.sh b/run-in-docker.sh
index 6777d9a31b56..31c477645033 100755
--- a/run-in-docker.sh
+++ b/run-in-docker.sh
@@ -15,4 +15,4 @@ docker run --rm -it \
         -v "${PWD}:/gen" \
         -v "${maven_cache_repo}:/var/maven/.m2/repository" \
         --entrypoint /gen/docker-entrypoint.sh \
-        maven:3-jdk-7 "$@"
+        maven:3-jdk-8 "$@"