summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSuren A. Chilingaryan <csa@suren.me>2019-10-01 20:47:37 +0200
committerSuren A. Chilingaryan <csa@suren.me>2019-10-01 20:47:37 +0200
commiteb8382d4dc76d5b3dcda1290f74e71989feae83a (patch)
tree56aef6ac06b6cac0dd8e7d66749b7a06589b889e
parent79c76eaef5039276bb3a8725ac8c9f05f89ef0de (diff)
downloadadei-eb8382d4dc76d5b3dcda1290f74e71989feae83a.tar.gz
adei-eb8382d4dc76d5b3dcda1290f74e71989feae83a.tar.bz2
adei-eb8382d4dc76d5b3dcda1290f74e71989feae83a.tar.xz
adei-eb8382d4dc76d5b3dcda1290f74e71989feae83a.zip
Reconcie /adei/log and /adei/mail
-rw-r--r--adei/Dockerfile2
-rwxr-xr-xadei/files/docker-entrypoint.sh2
-rwxr-xr-xadei/files/openshift-entrypoint.sh2
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