Debugging.

Dockerfile

@@ -8,7 +8,7 @@ WORKDIR /app
 ENV POSTGRES_HOST='localhost' \
 	POSTGRES_PORT='5432' \
 	POSTGRES_USER='folio' \
-	POSTGRES_PASSWORD='myVerySecret' \
+	POSTGRES_PASSWORD='pass' \
 	POSTGRES_DB='folio_modules' \
 	OKAPI_URL='http://localhost:9130' \
 	FOLIO_REGISTRY='http://folio-registry.aws.indexdata.com' \
@@ -19,8 +19,8 @@ ENV POSTGRES_HOST='localhost' \
 	REGISTER_MODULE_TRY_COUNT=120 \
 	DATABASE_TRY_COUNT=120 \
 	ADMIN_ID="99999999-9999-4999-9999-999999999999" \
-	ADMIN_USERNAME=admin \
-	ADMIN_PASSWORD=adminpw \
+	ADMIN_USERNAME=diku_admin \
+	ADMIN_PASSWORD=admin \
     CURL_CONNECT_TIMEOUT=3 \
 	APP_USER=folio
 

assets/scripts/register-tenant

@@ -8,8 +8,8 @@ description=""
 modules="okapi"
 frontend_modules=""
 authtoken=""
-okapi_token=""
-permission_id=""
+#okapi_token=""
+#permission_id=""
 permissions=""
 module_descriptor=""
 loadSample=false
@@ -568,7 +568,7 @@ get_permissions() {
 		-H "X-Okapi-Tenant: ${tenant_id}" \
 		-H "X-Okapi-Token: ${okapi_token}" \
 		--connect-timeout ${CURL_CONNECT_TIMEOUT} \
-		"${OKAPI_URL}/perms/permissions?query=childOf%3D%3D%5B%5D&length=1000" 2>&1`
+		"${OKAPI_URL}/perms/permissions?query=childOf%3D%3D%5B%5D&length=5000" 2>&1`
 
 	case "${result##*|}" in
 		200|201)
@@ -596,27 +596,29 @@ assign_permission() {
 }
 EOF
 
-	result=`echo "$payload" | curl \
-		-s \
-		-w '|%{http_code}' \
-		-X POST \
-		-H "Content-type: application/json" \
-		-H "X-Okapi-Tenant: ${tenant_id}" \
-		-H "X-Okapi-Token: ${okapi_token}" \
-		--connect-timeout ${CURL_CONNECT_TIMEOUT} \
-		"${OKAPI_URL}/perms/users/${permission_id}/permissions" \
-		-d @- 2>&1`
-
-	case "${result##*|}" in
-		200|201)
-			echo "done."
-			return 0
-			;;
-		*)
-			echo "${result##*|} ("${result%|*}")"
-			return 0
-			;;
-	esac
+	echo "$payload" | curl -X POST -H "Content-type: application/json" -H "X-Okapi-Tenant: ${tenant_id}" -H "X-Okapi-Token: ${okapi_token}" ${OKAPI_URL}/perms/users/${permission_id}/permissions -d @-
+	
+
+	# result=`echo "$payload" | curl \
+	# 	-X POST \
+	# 	-H "Content-type: application/json" \
+	# 	-H "X-Okapi-Tenant: ${tenant_id}" \
+	# 	-H "X-Okapi-Token: ${okapi_token}" \
+	# 	--connect-timeout ${CURL_CONNECT_TIMEOUT} \
+	# 	"${OKAPI_URL}/perms/users/${permission_id}/permissions" \
+	# 	-d @- 2>&1`
+
+	# case "${result##*|}" in
+	# 	200|201)
+	# 		echo "done."
+	# 		return 0
+	# 		;;
+	# 	*)
+	# 		echo "${result##*|} ("${result%|*}")"
+	# 		sleep 2
+	# 		return 0
+	# 		;;
+	# esac
 }
 
 register_frontend_modules() {
@@ -635,16 +637,6 @@ assign_permissions() {
 main() {
 	parse_cmdline_parameters $@ \
 		&& wait_for_okapi \
-		&& register_frontend_modules $frontend_modules \
-		&& (tenant_exists || create_tenant) \
-		&& wait_for_backend_modules $backend_modules && install_modules $modules \
-		&& find_module_authtoken \
-		&& disable_module_for_tenant $authtoken \
-		&& create_admin \
-		&& create_admin_credentials \
-		&& create_admin_permission "perms.all" \
-		&& install_modules $modules \
-		&& login \
 		&& get_permissions \
 		&& assign_permissions $permissions
 

docker-compose.yml

@@ -12,15 +12,15 @@ services:
       POSTGRES_USER: folio
       POSTGRES_PASSWORD: myVerySecret
       POSTGRES_HOST: db
-      OKAPI_URL: http://okapi:9130
+      OKAPI_URL: https://okapi.staging.folio.finc.info
       ADMIN_USERNAME: admin
       ADMIN_PASSWORD: adminpw
       INSTALL_TRY_COUNT: 3
     command: >
       register-tenant
       --debug
-      --id diku
-      --name diku
+      --id de_15
+      --name de_15
       --description "test tenant"
       --loadReference
       --install-backend-module mod-notify-2.3.1
@@ -109,7 +109,7 @@ services:
       --install-frontend-module folio_tenant-settings-2.12.0
       --install-frontend-module folio_users-2.24.1
 
-networks:
-  default:
-    external:
-      name: folio
\ No newline at end of file
+#networks:
+#  default:
+#    external:
+#      name: folio
\ No newline at end of file