From eb8382d4dc76d5b3dcda1290f74e71989feae83a Mon Sep 17 00:00:00 2001 From: "Suren A. Chilingaryan" Date: Tue, 1 Oct 2019 20:47:37 +0200 Subject: Reconcie /adei/log and /adei/mail --- adei/Dockerfile | 2 +- adei/files/docker-entrypoint.sh | 2 +- adei/files/openshift-entrypoint.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/adei/Dockerfile b/adei/Dockerfile index e134875..48cea80 100644 --- a/adei/Dockerfile +++ b/adei/Dockerfile @@ -47,7 +47,7 @@ RUN zypper ar http://download.opensuse.org/repositories/home:/csa7fff:/adei/open rm -rf /var/log/apache2 && \ ln -s /adei/log /var/log/apache2 && \ rm -rf /var/spool/mail && \ - ln -s /adei/mail /var/spool/mail && \ + ln -s /adei/log /var/spool/mail && \ \ # Modify for non-priviledged mode chmod +rx /etc/php5/conf.d && \ diff --git a/adei/files/docker-entrypoint.sh b/adei/files/docker-entrypoint.sh index 1e99d15..6f0fa88 100755 --- a/adei/files/docker-entrypoint.sh +++ b/adei/files/docker-entrypoint.sh @@ -2,7 +2,7 @@ set -e -mkdir -p /adei/{src,cfg,tmp,sys,log,mail} +mkdir -p /adei/{src,cfg,tmp,sys,log} if ! whoami &> /dev/null; then if [ -w /etc/passwd ]; then diff --git a/adei/files/openshift-entrypoint.sh b/adei/files/openshift-entrypoint.sh index 6dde9a8..9353b5d 100755 --- a/adei/files/openshift-entrypoint.sh +++ b/adei/files/openshift-entrypoint.sh @@ -1,6 +1,6 @@ #! /bin/bash -mkdir -p /adei/{src,cfg,tmp,sys,log,mail} +mkdir -p /adei/{src,cfg,tmp,sys,log} while [ ! -f /adei/cfg/.ready ]; do -- cgit v1.2.3