develop #11

Merged
glenux merged 5 commits from develop into master 2024-07-20 15:00:20 +00:00
6 changed files with 9 additions and 10 deletions
Showing only changes of commit 55c1b42170 - Show all commits

View file

@ -100,11 +100,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& mkdir /var/log/supervisord /var/run/supervisord
COPY supervisord.conf /etc/supervisord.conf
COPY --chmod=755 ./hooks/gx.post-installation.www.sh /app/gx.post-installation.www.sh
COPY --chmod=755 ./hooks/gx.post-installation.root.sh /docker-entrypoint-hooks.d/post-installation/gx.post-installation.root.sh
# COPY --chmod=755 ./hooks/gx.post-installation.www.sh /app/gx.post-installation.www.sh
# COPY --chmod=755 ./hooks/gx.post-installation.root.sh /docker-entrypoint-hooks.d/post-installation/gx.post-installation.root.sh
COPY --chmod=755 ./hooks/gx.before-starting.www.sh /app/gx.before-starting.www.sh
COPY --chmod=755 ./hooks/gx.before-starting.root.sh /docker-entrypoint-hooks.d/before-starting/gx.before-starting.root.sh
COPY --chmod=755 ./hooks/gx.before-starting.www.sh /docker-entrypoint-hooks.d/before-starting/gx.before-starting.www.sh
ENV NEXTCLOUD_UPDATE=1

View file

@ -2,7 +2,7 @@
all:
build:
docker-compose build
docker compose build
run:
docker-compose up -d
docker compose up -d

View file

@ -3,5 +3,5 @@
set -u
set -e
echo "== Running post-installation hooks as root user =="
echo "== Running before-starting hooks as $(id -un) user =="
su -l -s /bin/sh www-data -c /app/gx.before-starting.www.sh

View file

@ -3,7 +3,7 @@
set -u
set -e
echo "== Running post-installation hooks as www user =="
echo "== Running before-starting hooks as $(id -un) user =="
# wait for nextcloud to be initialized
WORKDIR=/var/www/html

View file

@ -3,6 +3,6 @@
set -u
set -e
echo "== Running post-installation hooks as root user =="
echo "== Running post-installation hooks as $(id -un) user =="
su -l -s /bin/sh www-data -c /app/gx.post-installation.www.sh

View file

@ -3,7 +3,7 @@
set -u
set -e
echo "== Running post-installation hooks as www user =="
echo "== Running post-installation hooks as $(id -un) user =="
# wait for nextcloud to be initialized
WORKDIR=/var/www/html