Skip to content

Commit 79378e8

Browse files
committed
- Update run-in-docker.sh to use jdk-8
- Update docker-entrypoint.sh for 3.0 style commands
1 parent 61d7047 commit 79378e8

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ cli="${GEN_DIR}/modules/swagger-codegen-cli"
1010
codegen="${cli}/target/swagger-codegen-cli.jar"
1111
cmdsrc="${cli}/src/main/java/io/swagger/codegen/cmd"
1212

13-
pattern="@Command(name = \"$1\""
13+
pattern="${1^} implements Runnable"
1414
if expr "x$1" : 'x[a-z][a-z-]*$' > /dev/null && fgrep -qe "$pattern" "$cmdsrc"/*.java || expr "$1" = 'help' > /dev/null; then
1515
# If ${GEN_DIR} has been mapped elsewhere from default, and that location has not been built
1616
if [[ ! -f "${codegen}" ]]; then

run-in-docker.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ docker run --rm -it \
1515
-v "${PWD}:/gen" \
1616
-v "${maven_cache_repo}:/var/maven/.m2/repository" \
1717
--entrypoint /gen/docker-entrypoint.sh \
18-
maven:3-jdk-7 "$@"
18+
maven:3-jdk-8 "$@"

0 commit comments

Comments
 (0)