Skip to content
Snippets Groups Projects
Commit 426dafd0 authored by Steffen Köhler's avatar Steffen Köhler
Browse files

Merge branch 'v2021-11' into 'master' 

V2021 11

See merge request !6
parents be161ce7 dc6a14ec
Branches master
1 merge request!6V2021 11
Pipeline #11461 passed with stages
in 3 minutes and 31 seconds
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 6
− 5
View file @ 426dafd0
......@@ -13,7 +13,7 @@ variables:
docker_build:
stage: build
image: ubleipzig/deployer:1.3.2
image: ubleipzig/deployer:1.5.0-rc2
services:
- docker:dind
script: |
......@@ -31,7 +31,7 @@ docker_build:
docker_publish_alpha:
stage: publish
image: ubleipzig/deployer:1.3.2
image: ubleipzig/deployer:1.5.0-rc2
services:
- docker:dind
script: |
......@@ -39,7 +39,8 @@ docker_publish_alpha:
--input image.tar.gz \
--docker-config "${DOCKER_ALPHA_AUTH_CONFIG}" \
--name ${alpha_repo} \
--tag ${CI_COMMIT_REF_SLUG}
--tag ${CI_COMMIT_REF_SLUG} \
--tag alpha
dependencies:
- docker_build
tags:
......@@ -51,7 +52,7 @@ docker_publish_alpha:
docker_publish_staging:
stage: publish
image: ubleipzig/deployer:1.3.2
image: ubleipzig/deployer:1.5.0-rc2
services:
- docker:dind
script: |
......@@ -69,7 +70,7 @@ docker_publish_staging:
docker_publish_production:
stage: publish
image: ubleipzig/deployer:1.3.2
image: ubleipzig/deployer:1.5.0-rc2
services:
- docker:dind
script: |
......
assets/scripts/register-tenant
+ 4
− 4
View file @ 426dafd0
......@@ -491,7 +491,7 @@ create_admin_permission() {
read -r -d '' payload <<EOF
{
"userId": "${ADMIN_ID}",
"permissions": [ "${permission}" ]
"permissions": [ ${permission} ]
}
EOF
......@@ -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=4000" 2>&1`
case "${result##*|}" in
200|201)
......@@ -642,7 +642,7 @@ main() {
&& disable_module_for_tenant $authtoken \
&& create_admin \
&& create_admin_credentials \
&& create_admin_permission "perms.all" \
&& create_admin_permission '"perms.all", "perms.users.item.post", "perms.users.assign.immutable", "perms.users.assign.mutable", "perms.users.assign.okapi"' \
&& install_modules $modules \
&& login \
&& get_permissions \
......@@ -651,4 +651,4 @@ main() {
return $?
}
main "$@"
\ No newline at end of file
main "$@"
docker-compose.yml
+ 111
− 86
View file @ 426dafd0
......@@ -23,93 +23,118 @@ services:
--name diku
--description "test tenant"
--loadReference
--install-backend-module mod-notify-2.3.1
--install-backend-module mod-configuration-5.1.0
--install-backend-module mod-source-record-storage-2.5.0
--install-backend-module edge-oai-pmh-2.0.1
--install-backend-module mod-users-15.6.1
--install-backend-module mod-template-engine-1.5.0
--install-backend-module edge-sip2-1.0.0
--install-backend-module mod-email-1.4.0
--install-backend-module mod-notes-2.6.1
--install-backend-module edge-patron-3.0.2
--install-backend-module mod-login-saml-1.2.2
--install-backend-module mod-invoice-1.0.0
--install-backend-module mod-calendar-1.6.0
--install-backend-module mod-data-import-converter-storage-1.4.0
--install-backend-module mod-login-6.0.0
--install-backend-module mod-inventory-storage-16.0.2
--install-backend-module mod-codex-inventory-1.5.0
--install-backend-module mod-agreements-1.8.0
--install-backend-module mod-gobi-1.6.0
--install-backend-module mod-event-config-1.3.1
--install-backend-module mod-kb-ebsco-java-2.5.1
--install-backend-module mod-organizations-storage-2.0.0
--install-backend-module edge-orders-2.0.2
--install-backend-module mod-user-import-3.1.0
--install-backend-module mod-oai-pmh-1.1.0
--install-backend-module mod-erm-usage-2.4.1
--install-backend-module mod-source-record-manager-1.5.0
--install-backend-module mod-data-import-1.5.0
--install-backend-module mod-codex-ekb-1.4.0
--install-backend-module edge-rtac-2.0.1
--install-backend-module mod-authtoken-2.2.1
--install-backend-module mod-users-bl-5.0.0
--install-backend-module mod-permissions-5.8.1
--install-backend-module mod-rtac-1.2.3
--install-backend-module mod-circulation-16.5.0
--install-backend-module mod-patron-3.0.2
--install-backend-module mod-sender-1.1.0
--install-backend-module mod-invoice-storage-1.0.0
--install-backend-module mod-inventory-12.0.0
--install-backend-module mod-tags-0.4.0
--install-backend-module mod-codex-mux-2.6.0
--install-backend-module mod-feesfines-15.5.0
--install-backend-module mod-circulation-storage-9.1.0
--install-backend-module mod-orders-storage-7.0.0
--install-backend-module mod-finance-storage-3.0.0
--install-backend-module mod-licenses-1.8.0
--install-backend-module mod-erm-usage-harvester-1.3.2
--install-backend-module mod-password-validator-1.4.0
--install-backend-module mod-orders-7.0.1
--install-frontend-module folio_acquisition-units-1.0.0
--install-frontend-module folio_agreements-3.0.0
--install-frontend-module folio_calendar-2.4.0
--install-frontend-module folio_checkin-1.8.0
--install-frontend-module folio_checkout-1.10.0
--install-frontend-module folio_circulation-1.9.0
--install-frontend-module folio_data-import-1.4.0
--install-frontend-module folio_developer-1.10.0
--install-frontend-module folio_eholdings-1.9.0
--install-frontend-module folio_erm-usage-2.3.0
--install-frontend-module folio_finance-1.6.0
--install-frontend-module folio_inventory-1.11.1
--install-frontend-module folio_invoice-1.0.0
--install-frontend-module folio_licenses-3.3.0
--install-frontend-module folio_myprofile-1.7.0
--install-frontend-module folio_notes-1.2.0
--install-frontend-module folio_orders-1.6.0
--install-frontend-module folio_organizations-1.3.0
--install-frontend-module folio_plugin-create-item-1.2.0
--install-frontend-module folio_plugin-find-agreement-3.0.0
--install-frontend-module folio_plugin-find-contact-1.2.0
--install-frontend-module folio_plugin-find-erm-usage-data-provider-1.1.0
--install-frontend-module folio_plugin-find-instance-1.4.0
--install-frontend-module folio_plugin-find-interface-1.1.0
--install-frontend-module folio_plugin-find-license-3.3.0
--install-frontend-module folio_plugin-find-organization-1.3.0
--install-frontend-module folio_plugin-find-po-line-1.0.0
--install-frontend-module folio_plugin-find-user-1.8.0
--install-frontend-module folio_requests-1.11.0
--install-frontend-module folio_search-1.8.0
--install-frontend-module folio_servicepoints-1.4.0
--install-frontend-module folio_stripes-core-3.7.0
--install-frontend-module folio_stripes-2.8.0
--install-frontend-module folio_tags-1.3.2
--install-frontend-module folio_tenant-settings-2.12.0
--install-frontend-module folio_users-2.24.1
--install-backend-module mod-user-import-3.3.2
--install-backend-module mod-data-import-1.11.1
--install-backend-module mod-ncip-1.6.3
--install-backend-module edge-ncip-1.4.0
--install-backend-module mod-configuration-5.5.0
--install-backend-module edge-rtac-2.1.1
--install-backend-module mod-template-engine-1.12.0
--install-backend-module mod-codex-ekb-1.7.2
--install-backend-module mod-invoice-4.1.2
--install-backend-module mod-sender-1.4.0
--install-backend-module mod-source-record-manager-2.4.3
--install-backend-module edge-sip2-1.4.0
--install-backend-module mod-inventory-16.1.3
--install-backend-module mod-finance-4.0.1
--install-backend-module mod-finance-storage-6.0.1
--install-backend-module mod-circulation-19.2.8
--install-backend-module mod-licenses-3.0.1
--install-backend-module mod-gobi-1.11.1
--install-backend-module mod-quick-marc-1.2.2
--install-backend-module mod-patron-blocks-1.1.4
--install-backend-module mod-users-bl-6.1.1
--install-backend-module mod-organizations-1.1.1
--install-backend-module mod-erm-usage-harvester-2.0.2
--install-backend-module mod-patron-4.3.0
--install-backend-module edge-patron-4.3.0
--install-backend-module mod-login-saml-2.0.1
--install-backend-module mod-oai-pmh-3.2.8
--install-backend-module mod-orders-storage-11.1.4
--install-backend-module mod-codex-mux-2.9.2
--install-backend-module mod-users-17.2.2
--install-backend-module mod-invoice-storage-4.1.2
--install-backend-module mod-agreements-3.0.1
--install-backend-module mod-erm-usage-3.0.2
--install-backend-module mod-data-export-3.0.4
--install-backend-module mod-tags-0.7.2
--install-backend-module mod-notes-2.10.2
--install-backend-module mod-circulation-storage-12.1.4
--install-backend-module edge-oai-pmh-2.3.0
--install-backend-module mod-organizations-storage-3.2.2
--install-backend-module mod-authtoken-2.6.0
--install-backend-module mod-rtac-2.0.1
--install-backend-module mod-kb-ebsco-java-3.6.5
--install-backend-module mod-audit-1.0.4
--install-backend-module mod-feesfines-15.9.2
--install-backend-module mod-source-record-storage-4.1.4
--install-backend-module mod-permissions-5.12.2
--install-backend-module mod-data-import-converter-storage-1.9.2
--install-backend-module mod-courses-1.1.2
--install-backend-module mod-pubsub-1.3.3
--install-backend-module mod-email-1.9.2
--install-backend-module mod-orders-11.1.2
--install-backend-module mod-inventory-storage-19.4.4
--install-backend-module mod-login-7.1.1
--install-backend-module mod-codex-inventory-1.8.0
--install-backend-module mod-calendar-1.10.1
--install-backend-module mod-notify-2.7.1
--install-backend-module mod-password-validator-1.8.2
--install-backend-module mod-finc-config-4.0.1
--install-backend-module mod-event-config-1.6.1
--install-backend-module edge-orders-2.3.0
--install-frontend-module folio_plugin-create-inventory-records-1.0.0
--install-frontend-module folio_plugin-find-package-title-2.0.1
--install-frontend-module folio_quick-marc-2.0.1
--install-frontend-module folio_tags-4.0.0
--install-frontend-module folio_organizations-2.2.1
--install-frontend-module folio_users-5.0.9
--install-frontend-module folio_erm-usage-4.0.2
--install-frontend-module folio_plugin-find-import-profile-3.0.0
--install-frontend-module folio_stripes-smart-components-5.0.4
--install-frontend-module folio_calendar-5.0.0
--install-frontend-module folio_stripes-core-6.0.1
--install-frontend-module folio_licenses-5.0.1
--install-frontend-module folio_plugin-find-organization-2.2.0
--install-frontend-module folio_checkin-4.0.2
--install-frontend-module folio_plugin-find-po-line-2.2.1
--install-frontend-module folio_myprofile-4.0.1
--install-frontend-module folio_inventory-5.0.6
--install-frontend-module folio_data-export-3.0.2
--install-frontend-module folio_servicepoints-4.0.1
--install-frontend-module folio_oai-pmh-1.3.1
--install-frontend-module folio_eholdings-5.0.5
--install-frontend-module folio_local-kb-admin-3.0.0
--install-frontend-module folio_finance-2.2.0
--install-frontend-module folio_invoice-2.2.3
--install-frontend-module folio_finc-config-2.0.0
--install-frontend-module folio_finc-select-2.0.1
--install-frontend-module folio_plugin-find-finc-metadata-source-2.0.0
--install-frontend-module folio_plugin-find-license-5.0.0
--install-frontend-module folio_agreements-5.0.1
--install-frontend-module folio_orders-2.2.6
--install-frontend-module folio_receiving-1.2.1
--install-frontend-module folio_developer-4.0.0
--install-frontend-module folio_search-3.1.0
--install-frontend-module folio_tenant-settings-5.0.1
--install-frontend-module folio_plugin-find-finc-metadata-collection-2.0.0
--install-frontend-module folio_courses-3.0.2
--install-frontend-module folio_notes-4.0.0
--install-frontend-module folio_acquisition-units-2.2.0
--install-frontend-module folio_plugin-find-contact-2.2.1
--install-frontend-module folio_checkout-5.0.1
--install-frontend-module folio_plugin-find-user-4.0.1
--install-frontend-module folio_plugin-find-interface-2.2.1
--install-frontend-module folio_circulation-4.0.2
--install-frontend-module folio_plugin-find-instance-4.0.0
--install-frontend-module folio_plugin-find-erm-usage-data-provider-2.0.0
--install-frontend-module folio_plugin-find-eresource-1.0.0
--install-frontend-module folio_data-import-3.0.3
--install-frontend-module folio_plugin-find-agreement-5.0.0
--install-frontend-module folio_requests-4.0.6
--install-frontend-module folio_erm-comparisons-1.1.1
networks:
default:
external:
name: folio
\ No newline at end of file
name: folio
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment