Skip to content
This repository was archived by the owner on Dec 25, 2024. It is now read-only.

Commit 362388a

Browse files
authored
Merge pull request #16 from openapi-json-schema-tools/feat_verifies_docker_hub_image
Fixes entrypoint file
2 parents 3d5f8a9 + 39e919d commit 362388a

File tree

3 files changed

+4
-68
lines changed

3 files changed

+4
-68
lines changed

.hub.cli.dockerfile

-32
This file was deleted.

.hub.online.dockerfile

-32
This file was deleted.

docker-entrypoint.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
set -euo pipefail
44

55
# GEN_DIR allows to share the entrypoint between Dockerfile and run-in-docker.sh (backward compatible)
6-
GEN_DIR=${GEN_DIR:-/opt/openapi-generator}
6+
GEN_DIR=${GEN_DIR:-/opt/openapi-json-schema-generator}
77
JAVA_OPTS=${JAVA_OPTS:-"-Xmx1024M -DloggerPath=conf/log4j.properties"}
88

9-
cli="${GEN_DIR}/modules/openapi-generator-cli"
10-
codegen="${cli}/target/openapi-generator-cli.jar"
9+
cli="${GEN_DIR}/modules/openapi-json-schema-generator-cli"
10+
codegen="${cli}/target/openapi-json-schema-generator-cli.jar"
1111

1212
# We code in a list of commands here as source processing is potentially buggy (requires undocumented conventional use of annotations).
1313
# A list of known commands helps us determine if we should compile CLI. There's an edge-case where a new command not added to this
@@ -31,7 +31,7 @@ if [[ -f "${codegen}" && -n "$(java ${JAVA_OPTS} -jar "${codegen}" completion |
3131
elif [[ -n "$(echo $commands | tr ',' '\n' | grep "^$1\$" )" ]]; then
3232
# If CLI jar does not exist, and $1 is a known CLI command, build the CLI jar and run that command.
3333
if [[ ! -f "${codegen}" ]]; then
34-
(cd "${GEN_DIR}" && exec mvn -am -pl "modules/openapi-generator-cli" -Duser.home=$(dirname $MAVEN_CONFIG) package)
34+
(cd "${GEN_DIR}" && exec mvn -am -pl "modules/openapi-json-schema-generator-cli" -Duser.home=$(dirname $MAVEN_CONFIG) package)
3535
fi
3636
command=$1
3737
shift

0 commit comments

Comments
 (0)