changes for improved kitodo docker compose

.env

@@ -6,17 +6,17 @@ CONTROLLER_ENV_UID=1001
 CONTROLLER_ENV_GID=1001
 CONTROLLER_ENV_UMASK=0002
 CONTROLLER_PORT_SSH=8022
-CONTROLLER_KEYS=${PWD}/ocrd/controller/.ssh/authorized_keys
-CONTROLLER_DATA=${PWD}/kitodo/data/metadata
-CONTROLLER_MODELS=${PWD}/ocrd/controller/models
-CONTROLLER_CONFIG=${PWD}/ocrd/controller/config
+CONTROLLER_KEYS=./ocrd/controller/.ssh/authorized_keys
+CONTROLLER_DATA=./kitodo/data/metadata
+CONTROLLER_MODELS=./ocrd/controller/models
+CONTROLLER_CONFIG=./ocrd/controller/config
 CONTROLLER_WORKERS=1
 
 MONITOR_IMAGE=bertsky/ocrd_monitor
 MONITOR_HOST=ocrd-monitor
 MONITOR_PORT_WEB=5000
 MONITOR_PORT_GTK=8085
-MONITOR_DATA=${PWD}/kitodo/data/metadata
+MONITOR_DATA=./kitodo/data/metadata
 
 MANAGER_IMAGE=markusweigelt/ocrd_manager
 MANAGER_IMAGE_TAG=latest
@@ -25,20 +25,21 @@ MANAGER_ENV_UID=1001
 MANAGER_ENV_GID=1001
 MANAGER_ENV_UMASK=0002
 MANAGER_PORT_SSH=9022
-MANAGER_KEYS=${PWD}/ocrd/manager/.ssh/authorized_keys
-MANAGER_KEY=${PWD}/ocrd/manager/.ssh/id_rsa
-MANAGER_DATA=${PWD}/kitodo/data/metadata
+MANAGER_KEYS=./ocrd/manager/.ssh/authorized_keys
+MANAGER_KEY=./ocrd/manager/.ssh/id_rsa
+MANAGER_DATA=./kitodo/data/metadata
 
 # Builder Kitodo.Production
 BUILDER_TYPE=GIT
 BUILDER_GIT_COMMIT=ocrd-main
 BUILDER_GIT_SOURCE_URL=https://github.com/markusweigelt/kitodo-production/
+BUILDER_BUILD_RESOURCES=./_modules/kitodo-production-docker/kitodo/build-resources
 
 # Application Kitodo.Production
-APP_BUILD_CONTEXT=${PWD}/_modules/kitodo-production-docker/kitodo
-APP_BUILD_RESOURCES=${APP_BUILD_CONTEXT}/build-resources
-APP_DATA=${PWD}/kitodo/data
-APP_KEY=${PWD}/kitodo/.ssh/id_rsa
+APP_BUILD_CONTEXT=.
+APP_BUILD_RESOURCES=./build-resources
+APP_DATA=./kitodo/data
+APP_KEY=./kitodo/.ssh/id_rsa
 APP_PORT=8080
 APP_DEBUG=false
 APP_DEBUG_PORT=5005

.gitignore

@@ -1,2 +1,3 @@
 /ocrd/*
 /kitodo/*
+*.iml

Makefile

@@ -12,35 +12,29 @@ ifeq (managed,$(MODE))
 COMPOSE_FILES += docker-compose.managed.yml
 endif
 COMPOSE_FILES += docker-compose.kitodo-app.yml
-COMPOSE_FILES += docker-compose.kitodo-app.override.yml
 NULL :=
 WHITE := $(NULL) $(NULL)
 COLON := :
 COMPOSE_FILE = $(subst $(WHITE),$(COLON),$(COMPOSE_FILES))
+COMPOSE_PATH_SEPARATOR = $(COLON)
 
 .EXPORT_ALL_VARIABLES:
 
 clean:
 	$(RM) -fr kitodo ocrd
 
-build: ./kitodo
 build: ./kitodo
 build: ./kitodo/.ssh/id_rsa
 build: ./ocrd/manager/.ssh/id_rsa
 build: ./ocrd/controller/.ssh/authorized_keys
 build: ./ocrd/manager/.ssh/authorized_keys
 build:
-	$(MAKE) -C _modules/kitodo-production-docker build
-
-./kitodo: ./_resources/config_modules.zip
-
-./kitodo: ./_resources/config_modules.zip
-	unzip $< -d $@
-	touch -m $@
+	mkdir -p _modules/kitodo-production-docker/kitodo/build-resources
+	docker-compose -f ./docker-compose.kitodo-builder.yml up --build 
 
 ./kitodo/.ssh/: ./kitodo
 
-./ocrd/controller/models/ ./ocrd/controller/config/  ./ocrd/manager/.ssh/ ./kitodo/.ssh/ ./ocrd/controller/.ssh/:
+./ocrd/controller/models/ ./ocrd/controller/config/  ./ocrd/manager/.ssh/ ./kitodo ./kitodo/.ssh/ ./ocrd/controller/.ssh/:
 	mkdir -p $@
 
 ./kitodo/.ssh/id_rsa: | ./kitodo/.ssh/
@@ -56,7 +50,7 @@ build:
 	cp $<.pub $@
 
 start:
-	docker-compose up --build -d
+	docker-compose up -d --build 
 
 down:
 	docker-compose down
@@ -94,4 +88,5 @@ help: ; @eval "$$HELP"
 .PHONY: clean build start down config status help
 
 # do not search for implicit rules here:
-%.zip Makefile: ;
+%.zip: ;
+Makefile: ;

docker-compose.kitodo-app.yml

@@ -0,0 +1,48 @@
+services:
+
+  kitodo-app:
+    extends:
+      file: _modules/kitodo-production-docker/kitodo/kitodo-services.yml
+      service: kitodo-app  
+
+    environment:
+      - "OCRD_MANAGER=${MANAGER_HOST}:22"
+
+    depends_on:
+      - kitodo-db
+      - kitodo-es
+      - kitodo-mq  
+      - ocrd-manager
+
+    volumes:
+      - type: bind
+        source: ${APP_KEY}
+        target: /id_rsa
+      - type: bind
+        source: ./_resources/kitodo.sql
+        target: /tmp/kitodo/kitodo.sql
+      - ${APP_DATA}:/usr/local/kitodo    
+
+
+  kitodo-db:
+    extends:
+      file: _modules/kitodo-production-docker/kitodo/kitodo-services.yml
+      service: kitodo-db 
+
+
+  kitodo-es:
+    extends:
+      file: _modules/kitodo-production-docker/kitodo/kitodo-services.yml
+      service: kitodo-es 
+
+
+  kitodo-mq:
+    extends:
+      file: _modules/kitodo-production-docker/kitodo/kitodo-services.yml
+      service: kitodo-mq
+
+    # TODO add resource to kitodo active mq image
+    volumes:   
+       - type: bind
+         source: ./_resources/kitodo-activemq.xml
+         target: /opt/activemq/conf/activemq.xml

docker-compose.kitodo-builder.yml

@@ -0,0 +1,17 @@
+services:
+
+  kitodo-builder:
+    extends:
+      file: _modules/kitodo-production-docker/kitodo/kitodo-services.yml
+      service: kitodo-builder
+
+    depends_on:
+      - kitodo-db
+
+    volumes:
+      - ${BUILDER_BUILD_RESOURCES}:/data  
+
+  kitodo-db:
+    extends:
+      file: _modules/kitodo-production-docker/kitodo/kitodo-services.yml
+      service: kitodo-db