Merge branch '2020-q3-hf-1' into 'master'

2020 q3 hf 1

See merge request !6

.gitlab-ci.yml

@@ -11,7 +11,7 @@ variables:
 
 docker_build_and_publish_alpha:
   stage: build_and_publish
-  image: ubleipzig/deployer:1.3.2
+  image: ubleipzig/deployer:1.5.0-rc2
   services:
   - docker:dind
   script: |
@@ -46,7 +46,7 @@ docker_build_and_publish_alpha:
 
 docker_build_and_publish_staging:
   stage: build_and_publish
-  image: ubleipzig/deployer:1.3.2
+  image: ubleipzig/deployer:1.5.0-rc2
   services:
   - docker:dind
   script: |
@@ -79,7 +79,7 @@ docker_build_and_publish_staging:
 
 docker_build_and_publish_production:
   stage: build_and_publish
-  image: ubleipzig/deployer:1.3.2
+  image: ubleipzig/deployer:1.5.0-rc2
   services:
   - docker:dind
   script: |

assets/docker-entrypoint

-#!/usr/bin/env /bin/bash
+#!/usr/bin/env /bin/sh
 
 set -o pipefail -o noclobber
 

docker-compose.yml

 version: '2'
 services:
 
-  mod-feesfines:
-    image: mod-feesfines:test
+  mod-invoice-storage:
+    image: mod-invoice-storage:test
     environment:
-      SERVICE_URL: http://mod-feesfines:8081
+      SERVICE_URL: http://mod-invoice-storage:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -13,10 +13,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-users:
-    image: mod-users:test
+  mod-finance-storage:
+    image: mod-finance-storage:test
     environment:
-      SERVICE_URL: http://mod-users:8081
+      SERVICE_URL: http://mod-finance-storage:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -25,10 +25,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-password-validator:
-    image: mod-password-validator:test
+  mod-configuration:
+    image: mod-configuration:test
     environment:
-      SERVICE_URL: http://mod-password-validator:8081
+      SERVICE_URL: http://mod-configuration:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -37,10 +37,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-permissions:
-    image: mod-permissions:test
+  mod-source-record-manager:
+    image: mod-source-record-manager:test
     environment:
-      SERVICE_URL: http://mod-permissions:8081
+      SERVICE_URL: http://mod-source-record-manager:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -49,10 +49,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-login:
-    image: mod-login:test
+  mod-codex-mux:
+    image: mod-codex-mux:test
     environment:
-      SERVICE_URL: http://mod-login:8081
+      SERVICE_URL: http://mod-codex-mux:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -61,10 +61,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-inventory-storage:
-    image: mod-inventory-storage:test
+  mod-sender:
+    image: mod-sender:test
     environment:
-      SERVICE_URL: http://mod-inventory-storage:8081
+      SERVICE_URL: http://mod-sender:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -73,10 +73,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-configuration:
-    image: mod-configuration:test
+  mod-password-validator:
+    image: mod-password-validator:test
     environment:
-      SERVICE_URL: http://mod-configuration:8081
+      SERVICE_URL: http://mod-password-validator:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -85,10 +85,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-authtoken:
-    image: mod-authtoken:test
+  mod-inventory:
+    image: mod-inventory:test
     environment:
-      SERVICE_URL: http://mod-authtoken:8081
+      SERVICE_URL: http://mod-inventory:9403
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -97,10 +97,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-circulation-storage:
-    image: mod-circulation-storage:test
+  mod-event-config:
+    image: mod-event-config:test
     environment:
-      SERVICE_URL: http://mod-circulation-storage:8081
+      SERVICE_URL: http://mod-event-config:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -109,10 +109,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-circulation:
-    image: mod-circulation:test
+  mod-permissions:
+    image: mod-permissions:test
     environment:
-      SERVICE_URL: http://mod-circulation:9801
+      SERVICE_URL: http://mod-permissions:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -121,10 +121,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-inventory:
-    image: mod-inventory:test
+  mod-erm-usage:
+    image: mod-erm-usage:test
     environment:
-      SERVICE_URL: http://mod-inventory:9403
+      SERVICE_URL: http://mod-erm-usage:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -133,10 +133,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-codex-mux:
-    image: mod-codex-mux:test
+  mod-authtoken:
+    image: mod-authtoken:test
     environment:
-      SERVICE_URL: http://mod-codex-mux:8081
+      SERVICE_URL: http://mod-authtoken:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -145,10 +145,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-codex-inventory:
-    image: mod-codex-inventory:test
+  mod-users-bl:
+    image: mod-users-bl:test
     environment:
-      SERVICE_URL: http://mod-codex-inventory:8081
+      SERVICE_URL: http://mod-users-bl:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -157,10 +157,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-login-saml:
-    image: mod-login-saml:test
+  mod-data-import:
+    image: mod-data-import:test
     environment:
-      SERVICE_URL: http://mod-login-saml:8081
+      SERVICE_URL: http://mod-data-import:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -169,10 +169,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-notify:
-    image: mod-notify:test
+  mod-circulation-storage:
+    image: mod-circulation-storage:test
     environment:
-      SERVICE_URL: http://mod-notify:8081
+      SERVICE_URL: http://mod-circulation-storage:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -181,10 +181,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-notes:
-    image: mod-notes:test
+  mod-organizations-storage:
+    image: mod-organizations-storage:test
     environment:
-      SERVICE_URL: http://mod-notes:8081
+      SERVICE_URL: http://mod-organizations-storage:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -193,10 +193,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-users-bl:
-    image: mod-users-bl:test
+  mod-invoice:
+    image: mod-invoice:test
     environment:
-      SERVICE_URL: http://mod-users-bl:8081
+      SERVICE_URL: http://mod-invoice:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -217,34 +217,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-calendar:
-    image: mod-calendar:test
-    environment:
-      SERVICE_URL: http://mod-calendar:8081
-      DB_DATABASE: folio_modules
-      DB_USERNAME: folio
-      DB_PASSWORD: myVerySecret
-      DB_HOST: okapi-db
-      DB_PORT: "5432"
-      OKAPI_URL: http://okapi:9130
-      SELF_INTRODUCE: "true"
-
-  mod-template-engine:
-    image: mod-template-engine:test
-    environment:
-      SERVICE_URL: http://mod-template-engine:8081
-      DB_DATABASE: folio_modules
-      DB_USERNAME: folio
-      DB_PASSWORD: myVerySecret
-      DB_HOST: okapi-db
-      DB_PORT: "5432"
-      OKAPI_URL: http://okapi:9130
-      SELF_INTRODUCE: "true"
-
-  mod-finance-storage:
-    image: mod-finance-storage:test
+  mod-agreements:
+    image: mod-agreements:test
     environment:
-      SERVICE_URL: http://mod-finance-storage:8081
+      SERVICE_URL: http://mod-agreements:8080
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -253,10 +229,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-orders-storage:
-    image: mod-orders-storage:test
+  mod-kb-ebsco-java:
+    image: mod-kb-ebsco-java:test
     environment:
-      SERVICE_URL: http://mod-orders-storage:8081
+      SERVICE_URL: http://mod-kb-ebsco-java:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -277,10 +253,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-rtac:
-    image: mod-rtac:test
+  mod-feesfines:
+    image: mod-feesfines:test
     environment:
-      SERVICE_URL: http://mod-rtac:8081
+      SERVICE_URL: http://mod-feesfines:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -289,10 +265,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-sender:
-    image: mod-sender:test
+  mod-users:
+    image: mod-users:test
     environment:
-      SERVICE_URL: http://mod-sender:8081
+      SERVICE_URL: http://mod-users:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -301,10 +277,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-codex-ekb:
-    image: mod-codex-ekb:test
+  mod-orders-storage:
+    image: mod-orders-storage:test
     environment:
-      SERVICE_URL: http://mod-codex-ekb:8081
+      SERVICE_URL: http://mod-orders-storage:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -313,10 +289,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-user-import:
-    image: mod-user-import:test
+  mod-licenses:
+    image: mod-licenses:test
     environment:
-      SERVICE_URL: http://mod-user-import:8081
+      SERVICE_URL: http://mod-licenses:8080
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -325,10 +301,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-kb-ebsco-java:
-    image: mod-kb-ebsco-java:test
+  mod-notify:
+    image: mod-notify:test
     environment:
-      SERVICE_URL: http://mod-kb-ebsco-java:8081
+      SERVICE_URL: http://mod-notify:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -337,10 +313,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-email:
-    image: mod-email:test
+  mod-pubsub:
+    image: mod-pubsub:test
     environment:
-      SERVICE_URL: http://mod-email:8081
+      SERVICE_URL: http://mod-pubsub:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -348,11 +324,13 @@ services:
       DB_PORT: "5432"
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
+      KAFKA_HOST: kafka
+      KAFKA_PORT: "9092"
 
-  mod-event-config:
-    image: mod-event-config:test
+  mod-email:
+    image: mod-email:test
     environment:
-      SERVICE_URL: http://mod-event-config:8081
+      SERVICE_URL: http://mod-email:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -361,10 +339,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-licenses:
-    image: mod-licenses:test
+  mod-notes:
+    image: mod-notes:test
     environment:
-      SERVICE_URL: http://mod-licenses:8080
+      SERVICE_URL: http://mod-notes:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -373,10 +351,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-source-record-storage:
-    image: mod-source-record-storage:test
+  mod-courses:
+    image: mod-courses:test
     environment:
-      SERVICE_URL: http://mod-source-record-storage:8081
+      SERVICE_URL: http://mod-courses:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -385,10 +363,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-source-record-manager:
-    image: mod-source-record-manager:test
+  mod-login-saml:
+    image: mod-login-saml:test
     environment:
-      SERVICE_URL: http://mod-source-record-manager:8081
+      SERVICE_URL: http://mod-login-saml:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -409,22 +387,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-data-import:
-    image: mod-data-import:test
-    environment:
-      SERVICE_URL: http://mod-data-import:8081
-      DB_DATABASE: folio_modules
-      DB_USERNAME: folio
-      DB_PASSWORD: myVerySecret
-      DB_HOST: okapi-db
-      DB_PORT: "5432"
-      OKAPI_URL: http://okapi:9130
-      SELF_INTRODUCE: "true"
-
-  mod-agreements:
-    image: mod-agreements:test
+  mod-finance:
+    image: mod-finance:test
     environment:
-      SERVICE_URL: http://mod-agreements:8080
+      SERVICE_URL: http://mod-finance:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -433,10 +399,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-erm-usage:
-    image: mod-erm-usage:test
+  mod-login:
+    image: mod-login:test
     environment:
-      SERVICE_URL: http://mod-erm-usage:8081
+      SERVICE_URL: http://mod-login:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -457,22 +423,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-oai-pmh:
-    image: mod-oai-pmh:test
-    environment:
-      SERVICE_URL: http://mod-oai-pmh:8081
-      DB_DATABASE: folio_modules
-      DB_USERNAME: folio
-      DB_PASSWORD: myVerySecret
-      DB_HOST: okapi-db
-      DB_PORT: "5432"
-      OKAPI_URL: http://okapi:9130
-      SELF_INTRODUCE: "true"
-
-  mod-gobi:
-    image: mod-gobi:test
+  mod-calendar:
+    image: mod-calendar:test
     environment:
-      SERVICE_URL: http://mod-gobi:8081
+      SERVICE_URL: http://mod-calendar:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -481,10 +435,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-patron:
-    image: mod-patron:test
+  mod-inventory-storage:
+    image: mod-inventory-storage:test
     environment:
-      SERVICE_URL: http://mod-patron:8081
+      SERVICE_URL: http://mod-inventory-storage:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -493,10 +447,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  edge-rtac:
-    image: edge-rtac:test
+  mod-finc-config:
+    image: mod-finc-config:test
     environment:
-      SERVICE_URL: http://edge-rtac:8081
+      SERVICE_URL: http://mod-finc-config:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -505,10 +459,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  edge-oai-pmh:
-    image: edge-oai-pmh:test
+  mod-template-engine:
+    image: mod-template-engine:test
     environment:
-      SERVICE_URL: http://edge-oai-pmh:8081
+      SERVICE_URL: http://mod-template-engine:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -517,10 +471,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  edge-patron:
-    image: edge-patron:test
+  mod-circulation:
+    image: mod-circulation:test
     environment:
-      SERVICE_URL: http://edge-patron:8081
+      SERVICE_URL: http://mod-circulation:9801
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -529,10 +483,10 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  edge-orders:
-    image: edge-orders:test
+  mod-source-record-storage:
+    image: mod-source-record-storage:test
     environment:
-      SERVICE_URL: http://edge-orders:8081
+      SERVICE_URL: http://mod-source-record-storage:8081
       DB_DATABASE: folio_modules
       DB_USERNAME: folio
       DB_PASSWORD: myVerySecret
@@ -541,29 +495,7 @@ services:
       OKAPI_URL: http://okapi:9130
       SELF_INTRODUCE: "true"
 
-  mod-organizations-storage:
-    image: mod-organizations-storage:test
-    environment:
-      SERVICE_URL: http://mod-organizations-storage:8081
-      DB_DATABASE: folio_modules
-      DB_USERNAME: folio
-      DB_PASSWORD: myVerySecret
-      DB_HOST: okapi-db
-      DB_PORT: "5432"
-      OKAPI_URL: http://okapi:9130
-      SELF_INTRODUCE: "true"
 
-  mod-finc-config:
-    image: mod-finc-config:test
-    environment:
-      SERVICE_URL: http://mod-finc-config:8081
-      DB_DATABASE: folio_modules
-      DB_USERNAME: folio
-      DB_PASSWORD: myVerySecret
-      DB_HOST: okapi-db
-      DB_PORT: "5432"
-      OKAPI_URL: http://okapi:9130
-      SELF_INTRODUCE: "true"
 
 networks:
   default:

modules

-folioorg/mod-configuration:5.1.0
-folioorg/mod-agreements:1.7.0
-folioorg/mod-licenses:1.7.0
-folioorg/mod-organizations-storage:1.1.0
-folioorg/mod-erm-usage:2.3.1
-folioorg/mod-finance-storage:2.0.0
-folioorg/mod-finc-config:1.0.0
-folioorg/mod-erm-usage-harvester:1.3.1
-folioorg/mod-inventory-storage:15.5.1
-folioorg/mod-inventory:11.5.0
-folioorg/mod-users:15.6.0
-folioorg/mod-circulation-storage:8.1.0
-folioorg/mod-calendar:1.5.0
-folioorg/mod-event-config:1.3.0
-folioorg/mod-template-engine:1.4.0
-folioorg/mod-email:1.3.0
-folioorg/mod-sender:1.1.0
-folioorg/mod-notify:2.3.0
-folioorg/mod-circulation:16.3.0
-folioorg/mod-notes:2.5.0
-folioorg/mod-orders-storage:6.0.0
-folioorg/mod-orders:6.0.0
-folioorg/mod-permissions:5.8.0
-folioorg/mod-login:5.3.0
-folioorg/mod-password-validator:1.3.0
-folioorg/mod-authtoken:2.2.0
-folioorg/mod-users-bl:4.4.0
-folioorg/mod-tags:0.3.0