1
0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-06-07 16:06:14 +00:00

also build ssl helper container

fix creation of folders when ssl helper is run with mounted dirs
This commit is contained in:
Felix Bartels 2018-10-19 15:17:59 +02:00
parent a3315f61c9
commit b608aa59f5
3 changed files with 13 additions and 7 deletions

View File

@ -11,7 +11,7 @@ webapp_download_version = $(shell ./version.sh webapp)
COMPONENT = $(shell echo $(component) | tr a-z A-Z) COMPONENT = $(shell echo $(component) | tr a-z A-Z)
build-all: build-base build-core build-webapp build-all: build-ssl build-base build-core build-webapp
build: component ?= base build: component ?= base
build: build:
@ -26,6 +26,9 @@ build-core:
build-webapp: build-webapp:
component=webapp make build component=webapp make build
build-ssl:
docker build -t $(docker_repo)/kopano_ssl ssl/
tag: component ?= base tag: component ?= base
tag: tag:
@echo 'create tag $($(component)_version)' @echo 'create tag $($(component)_version)'
@ -48,7 +51,7 @@ tag-webapp:
repo-login: repo-login:
docker login -u $(docker_login) -p $(docker_pwd) docker login -u $(docker_login) -p $(docker_pwd)
publish: repo-login publish-base publish-core publish-webapp publish: repo-login publish-ssl publish-base publish-core publish-webapp
git push git push
git push origin --tags git push origin --tags
@ -66,3 +69,6 @@ publish-core: build-core tag-core
publish-webapp: build-webapp tag-webapp publish-webapp: build-webapp tag-webapp
component=webapp make publish-container component=webapp make publish-container
publish-ssl: build-ssl
docker push $(docker_repo)/kopano_ssl:latest

View File

@ -4,6 +4,7 @@ echo "Creating CA and Server certificates..."
easypki create --filename internalca --organizational-unit primary --expire 3650 --ca "Internal Kopano System" easypki create --filename internalca --organizational-unit primary --expire 3650 --ca "Internal Kopano System"
mkdir -p /kopano/ssl/clients/
cp /kopano/easypki/internalca/certs/internalca.crt /kopano/ssl/ca.pem cp /kopano/easypki/internalca/certs/internalca.crt /kopano/ssl/ca.pem
for s in kserver kdagent kmonitor ksearch kspooler kwebapp for s in kserver kdagent kmonitor ksearch kspooler kwebapp

View File

@ -1,8 +1,7 @@
#!/bin/sh #!/bin/sh
if [ -f /kopano/ssl/ca.pem ]; then
if [ -f /kopano/ssl/ca.pem ] exit 0
then exit 0
fi fi
/gencerts.sh /gencerts.sh