From 728e29bfd5d7f416dc529617e1143352bd4c8d36 Mon Sep 17 00:00:00 2001 From: milefork Date: Mon, 23 Oct 2017 11:25:50 +0200 Subject: [PATCH 1/2] docker-compose.yml : this image doesn't exist. Build it from Dockerfile docker-entrypoint.sh : the new sampleconfig.sh is gzipped so extract it --- docker-compose.yml | 2 +- scripts/docker-entrypoint.sh | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0500dbe..2455759 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ db: environment: - MYSQL_ROOT_PASSWORD=my-super-secret-password web: - image: openxpki:latest + build: ./ dns: 8.8.8.8 hostname: pki.example.org restart: always diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh index c33e40e..b25e9a4 100644 --- a/scripts/docker-entrypoint.sh +++ b/scripts/docker-entrypoint.sh @@ -64,10 +64,16 @@ function create_config { echo "Found custom configuration, securing and executing it." chown root:root /etc/openxpki/customconfig.sh chmod 700 /etc/openxpki/customconfig.sh - /etc/openxpki/customconfig.sh + sh /etc/openxpki/customconfig.sh + elif [ -f "/usr/share/doc/libopenxpki-perl/examples/sampleconfig.sh.gz" ]; then + echo "Found no custom customconfig.sh - using default compressed sampleconfig.sh.gz from /usr/share/doc/libopenxpki-perl/examples/sampleconfig.sh" + gunzip /usr/share/doc/libopenxpki-perl/examples/sampleconfig.sh.gz + chown root:root /usr/share/doc/libopenxpki-perl/examples/sampleconfig.sh + chmod 700 /usr/share/doc/libopenxpki-perl/examples/sampleconfig.sh + sh /usr/share/doc/libopenxpki-perl/examples/sampleconfig.sh elif [ -f "/usr/share/doc/libopenxpki-perl/examples/sampleconfig.sh" ]; then echo "Found no custom customconfig.sh - using default sampleconfig.sh from /usr/share/doc/libopenxpki-perl/examples/sampleconfig.sh" - /usr/share/doc/libopenxpki-perl/examples/sampleconfig.sh + sh /usr/share/doc/libopenxpki-perl/examples/sampleconfig.sh else echo "Found no sampleconfig.sh and no customconfig.sh" exit 1 From e54fa63b4208b32b8389e3cb20236016a1b45982 Mon Sep 17 00:00:00 2001 From: Christian Date: Fri, 22 Mar 2019 14:28:35 +0100 Subject: [PATCH 2/2] Update docker-compose.yml --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 2455759..d9d6497 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,7 +6,7 @@ db: environment: - MYSQL_ROOT_PASSWORD=my-super-secret-password web: - build: ./ + image: openxpki:latest dns: 8.8.8.8 hostname: pki.example.org restart: always @@ -22,4 +22,4 @@ web: - APP_DB_NAME=openxpki - APP_DB_USER=openxpki - APP_DB_PASS=openxpki - - APP_DB_ROOT_PASS=my-super-secret-password \ No newline at end of file + - APP_DB_ROOT_PASS=my-super-secret-password