make standard config run in docker

Makefile

@@ -22,9 +22,10 @@ prune:  ## prune unused images (all!)
 init: openxpki-config  ## clone initial config from github
 
 openxpki-config:
-	git clone  https://github.com/openxpki/openxpki-config --single-branch --branch=docker
+	git clone  https://github.com/openxpki/openxpki-config --single-branch --branch=develop
 
 compose: openxpki-config  ## call docker-compose, implies init
+	cp -n local.yaml openxpki-config/config.d/local.yaml
 	docker-compose up
 
 clean:  ## remove containers but keep volumes

bin/start-apache.sh

@@ -1,11 +1,14 @@
 #!/bin/bash
 CONFIG_CERT_PATH="/etc/openxpki/contrib/https"
 
-SSL_BASE_CRT_DIR=/etc/apache2/ssl.crt
-SSL_BASE_KEY_DIR=/etc/apache2/ssl.key
+SSL_BASE_CRT_DIR=/etc/openxpki/tls/endentity
+SSL_BASE_KEY_DIR=/etc/openxpki/tls/private
+
 
 SSL_CERT_FILE="$SSL_BASE_CRT_DIR/openxpki.crt"
-SSL_KEY_FILE="$SSL_BASE_KEY_DIR/openxpki.key"
+SSL_KEY_FILE="$SSL_BASE_KEY_DIR/openxpki.pem"
+
+SSL_CA_PATH=/etc/openxpki/tls/chain/
 
 # subj for self-signed certificate
 CERT_SUBJ="/CN=OpenXPKI Test"
@@ -84,6 +87,10 @@ else
   handle_cert_files
 fi
 
+
+mkdir -p "$SSL_CA_PATH"
+cp $SSL_CERT_FILE $SSL_CA_PATH/self-signed.crt
+c_rehash $SSL_CA_PATH
 # check if i18n update is requested
 test -e /etc/openxpki/i18n/.update && /usr/bin/update-i18n && rm -f /etc/openxpki/i18n/.update
 

docker-compose.yml

@@ -7,6 +7,7 @@ services:
     command: --default-authentication-plugin=mysql_native_password
     volumes:
       - openxpkidb:/var/lib/mysql
+      - openxpkidbsocket:/var/run/mysqld/
       - ./openxpki-config/contrib/sql/schema-mysql.sql:/docker-entrypoint-initdb.d/schema-mysql.sql
     environment:
       MYSQL_DATABASE: openxpki
@@ -22,6 +23,7 @@ services:
       - ./openxpki-config:/etc/openxpki
       - openxpkilog:/var/log/openxpki
       - openxpkisocket:/var/openxpki/
+      - openxpkidbsocket:/var/run/mysqld/
     depends_on:
         - db
 
@@ -41,6 +43,7 @@ services:
 
 volumes:
   openxpkidb:
+  openxpkidbsocket:
   openxpkisocket:
   openxpkilog:
 

local.yaml

@@ -0,0 +1,6 @@
+system:
+    database:
+        main:
+            wait_on_init:
+                retry_count: 10
+                retry_interval: 30