Merge pull request #70 from jmpsec/fix-docker-jwt

Fix for error generating jwt.json
jmpsec · May 11, 2020 · 72f3a38 · 72f3a38
2 parents a65efbf + 6b61e70
commit 72f3a38
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -164,9 +164,9 @@ docker_down:
 docker_clean:
 	make docker_down
 	./deploy/docker/dockerize.sh -x
+	rm -Rf deploy/docker/certs/*
+	rm -Rf deploy/docker/config/*
 	docker volume rm osctrl_db-data
-	rm -Rf docker/certs/*
-	rm -Rf docker/config/*
 
 # Auto-format and simplify the code
 GOFMT_ARGS = -l -w -s

diff --git a/deploy/docker/dockerize.sh b/deploy/docker/dockerize.sh
@@ -233,7 +233,7 @@ JWT_JSON="$CONFIGDIR/jwt.json"
 if [[ -f "$JWT_JSON" && "$_FORCE" == false ]]; then
   log "Using existing $JWT_JSON"
 else
-  cat "$CONFIGDIR/jwt.json" | sed "s|_JWT_SECRET|$_JWT_SECRET|g" | tee "$JWT_JSON"
+  cat "$DEPLOYDIR/config/jwt.json" | sed "s|_JWT_SECRET|$_JWT_SECRET|g" | tee "$JWT_JSON"
 fi
 
 log "Preparing configuration for backend"