Skip to content

Commit 8c03fe6

Browse files
committed
fix: entrypoint does not execute serve, when it should not
1 parent 9b37aa6 commit 8c03fe6

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

.docker/entrypoint.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ SD=".scroll"
55
input=$@
66

77
#Check if we should serve as default or when only artifact is specified
8-
if [ -z "$input" ] || [[ $input =~ ([^/]+)/([^:]+):([^/]+) ]]; then
9-
artifact="${input}"
8+
if [ -z "$input" ] || [[ $input =~ ([^/]+)/([^:]+):([^/]+) ]] && [[ $input != *" "* ]]; then artifact="${input}"
109
if [ -z "${artifact}" ];
1110
then
1211
artifact=$DRUID_SCROLL_ARTIFACT

cmd/serve.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,9 @@ func init() {
243243

244244
ServeCommand.Flags().StringVarP(&jwksUrl, "jwks-server", "", "", "JWKS Server to authenticate requests against")
245245

246-
ServeCommand.Flags().StringVarP(&userId, "user-id", "u", "", "Allowed user id")
246+
ServeCommand.Flags().StringVarP(&userId, "user-id", "u", "", "Allowed user ID, if JWKS is not set. It checks claims.sub of the JWT token")
247247

248-
ServeCommand.Flags().BoolVarP(&idleScroll, "idle", "", false, "Don't start the queue manager")
248+
ServeCommand.Flags().BoolVarP(&idleScroll, "idle", "", false, "Don't start the queue manager, just use coldstarter")
249249

250250
ServeCommand.Flags().BoolVarP(&watchPorts, "watch-ports", "", false, "Watch ports, even when coldstarter is not active")
251251

0 commit comments

Comments
 (0)