From e06adfad5c0953d2373926e1e7df53dc518c53d3 Mon Sep 17 00:00:00 2001
From: Carsten Karbach <carstenkarbach@gmx.de>
Date: Fri, 26 Jan 2018 17:25:20 +0100
Subject: [PATCH] Allow to add client certificate during docker build
---
build_docker.sh | 4 ++++
launch_docker.sh | 3 ++-
utils/sync.sh | 1 +
3 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/build_docker.sh b/build_docker.sh
index 7a64489..0ec481b 100755
--- a/build_docker.sh
+++ b/build_docker.sh
@@ -3,6 +3,8 @@
APACHE_SSL_CERT=./configs/certificates/ssl-cert-eventsapi.pem
APACHE_SSL_CERT_KEY=./configs/certificates/ssl-cert-eventsapi.key
+CLIENT_CERT_NAME=docker
+
# Create local relative folder for certificates
mkdir ./servercerts
if test -e "$APACHE_SSL_CERT";then
@@ -12,6 +14,8 @@ if test -e "$APACHE_SSL_CERT_KEY";then
cp $APACHE_SSL_CERT_KEY ./servercerts/ssl-cert-eventsapi.key
fi
+cp ./configs/certificates/"$CLIENT_CERT_NAME"* ./servercerts/
+
cp ~/workspace/dockerenv/*.rpm rpms
docker build -t karbach/restapi:v1 .
diff --git a/launch_docker.sh b/launch_docker.sh
index 6285dc6..5e634c8 100755
--- a/launch_docker.sh
+++ b/launch_docker.sh
@@ -1,3 +1,4 @@
#!/bin/bash
-docker run -d -p 443:443 -p 80:80 karbach/restapi:v1
+# docker run -d -p 443:443 -p 80:80 -v /home/jards/workspace/EventsAPI/dev:/var/www/html/EventsAPI -v /home/jards/workspace/EventsAPI/otherconfigs/ssh:/root/.ssh karbach/restapi:v1
+docker run -d -p 443:443 -p 80:80 karbach/restapi:v1
\ No newline at end of file
diff --git a/utils/sync.sh b/utils/sync.sh
index dd9042b..a576b7f 100755
--- a/utils/sync.sh
+++ b/utils/sync.sh
@@ -48,6 +48,7 @@ find $FOLDER -type f -name '*.shell' -exec chmod 711 {} +
find $FOLDER -type f -name '*.phar' -exec chmod 711 {} +
find $FOLDER -type f -name 'pre-commit' -exec chmod 711 {} +
chmod 777 './data'
+chmod 755 './rest/events'
COMPOSER_SUCCESS=1
--
GitLab