From 62e4d606190aa5ec3abd5f4953a5a1c81f8ad667 Mon Sep 17 00:00:00 2001
From: Griefed <griefed@griefed.de>
Date: Sat, 17 Oct 2020 23:33:40 +0200
Subject: [PATCH] Bugfixes
---
Dockerfile | 2 +-
.../cont-init.d/{50-install => 40-install} | 5 ++++
root/etc/cont-init.d/50-config | 11 ++++++++
root/etc/cont-init.d/{60-config => 60-git} | 27 +++++++------------
4 files changed, 26 insertions(+), 19 deletions(-)
rename root/etc/cont-init.d/{50-install => 40-install} (73%)
create mode 100644 root/etc/cont-init.d/50-config
rename root/etc/cont-init.d/{60-config => 60-git} (74%)
diff --git a/Dockerfile b/Dockerfile
index 42e1c46..5e9c3f3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -86,4 +86,4 @@ COPY root/ /
# Communicate ports and volumes to be used
EXPOSE 8080
-VOLUME /config /data
+VOLUME /config /data /plugins
diff --git a/root/etc/cont-init.d/50-install b/root/etc/cont-init.d/40-install
similarity index 73%
rename from root/etc/cont-init.d/50-install
rename to root/etc/cont-init.d/40-install
index d9800cf..4f2e89f 100644
--- a/root/etc/cont-init.d/50-install
+++ b/root/etc/cont-init.d/40-install
@@ -6,8 +6,13 @@ if [ ! -f "/config/www/ICEcoder/index.php" ]; then
"https://github.com/icecoder/ICEcoder/archive/${ICECODER_VERSION}.zip"
cd /tmp || exit
unzip -qq install.zip
+ mkdir /plugins
+ mv ICEcoder-*/data/* /data/
+ mv ICEcoder-*/plugins/* /plugins/
mv ICEcoder-* /app/ICEcoder
cd / || exit
rm -rf /tmp/* /config/www/data
+ rm -rf /app/ICEcoder/data
+ rm -rf /app/ICEcoder/plugins
chown -R abc:abc /app/ICEcoder
fi
diff --git a/root/etc/cont-init.d/50-config b/root/etc/cont-init.d/50-config
new file mode 100644
index 0000000..e261cd7
--- /dev/null
+++ b/root/etc/cont-init.d/50-config
@@ -0,0 +1,11 @@
+#!/usr/bin/with-contenv bash
+
+# Link data, code and plugins
+ln -sf /data /app/ICEcoder/data
+ln -sf /plugins /app/ICEcoder/plugins
+
+# permissions
+chown -R abc:abc \
+/config
+/data
+/plugins
diff --git a/root/etc/cont-init.d/60-config b/root/etc/cont-init.d/60-git
similarity index 74%
rename from root/etc/cont-init.d/60-config
rename to root/etc/cont-init.d/60-git
index 6ad0aeb..d24f292 100644
--- a/root/etc/cont-init.d/60-config
+++ b/root/etc/cont-init.d/60-git
@@ -8,11 +8,11 @@ if [ ! -e /lock.file ]; then
-i /etc/sudoers
sed -e 's/^wheel:\(.*\)/wheel:\1,abc/g' -i /etc/group
# create directory for project
- mkdir -p /app/ICEcoder/data/code
+ mkdir -p /data/code
# make sure URL is set and folder is empty to clone code
- if [ ${GITURL+x} ] && [ ! "$(/bin/ls -A /app/ICEcoder/data/code 2>/dev/null)" ] ; then \
+ if [ ${GITURL+x} ] && [ ! "$(/bin/ls -A /data/code 2>/dev/null)" ] ; then \
# clone the url the user passed to this directory
- git clone "${GITURL}" /app/ICEcoder/data/code
+ git clone "${GITURL}" /data/code
fi
else
# lock exists not importing project this is a restart
@@ -22,27 +22,18 @@ fi
# create lock file after first run
touch /lock.file
+# copy php ini for user editing
+[[ ! -e "/config/php/php.ini" ]] && \
+cp /etc/php7/php.ini /config/php/php.ini
+cp /config/php/php.ini /etc/php7/php.ini
+
# permissions
mkdir -p /config/sessions
echo "[cont-init.d] Setting permissions this may take some time"
chown -R abc:abc \
/data \
/config
+ /plugins
# make our folders
mkdir -p \
/config/{log/ICEcoder,php,sess}
-
-# copy php ini for user editing
-[[ ! -e "/config/php/php.ini" ]] && \
-cp /etc/php7/php.ini /config/php/php.ini
-cp /config/php/php.ini /etc/php7/php.ini
-
-# Link data, code and plugins
-rm /data && \
- ln -sf /app/ICEcoder/data /data
- ln -sf /app/ICEcoder/plugins /data/plugins
-
-# permissions
-chown -R abc:abc \
-/config
-/data
--
GitLab