aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-03-14 18:35:08 +01:00
Code Activity

Add NEXTCLOUD_BASE_DIR option

Browse source 
Correct code in entrypoint.sh and dockerfile
Signed-off-by: pierre <pierre.m@nikolov.fr>
This commit is contained in:
pierre 2019-03-15 12:15:24 +01:00
parent e92fdf68a1
commit b678bfc10e
27 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
13.0/apache/Dockerfile
View file

@ -15,7 +15,7 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/*; \
\
mkdir -p /var/spool/cron/crontabs; \
echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
# install the PHP extensions we need
# see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html

2
13.0/apache/entrypoint.sh
View file

@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
else
mkdir -p $NEXTCLOUD_BASE_DIR
if [ -f /usr/sbin/apache2ctl ]; then
sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
fi
fi

2
13.0/fpm-alpine/Dockerfile
View file

@ -11,7 +11,7 @@ RUN set -ex; \
; \
\
rm /var/spool/cron/crontabs/root; \
echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
# install the PHP extensions we need
# see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html

2
13.0/fpm-alpine/entrypoint.sh
View file

@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
else
mkdir -p $NEXTCLOUD_BASE_DIR
if [ -f /usr/sbin/apache2ctl ]; then
sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
fi
fi

2
13.0/fpm/Dockerfile
View file

@ -15,7 +15,7 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/*; \
\
mkdir -p /var/spool/cron/crontabs; \
echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
# install the PHP extensions we need
# see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html

2
13.0/fpm/entrypoint.sh
View file

@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
else
mkdir -p $NEXTCLOUD_BASE_DIR
if [ -f /usr/sbin/apache2ctl ]; then
sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
fi
fi

2
14.0/apache/Dockerfile
View file

@ -15,7 +15,7 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/*; \
\
mkdir -p /var/spool/cron/crontabs; \
echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
# install the PHP extensions we need
# see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html

2
14.0/apache/entrypoint.sh
View file

@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
else
mkdir -p $NEXTCLOUD_BASE_DIR
if [ -f /usr/sbin/apache2ctl ]; then
sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
fi
fi

2
14.0/fpm-alpine/Dockerfile
View file

@ -11,7 +11,7 @@ RUN set -ex; \
; \
\
rm /var/spool/cron/crontabs/root; \
echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
# install the PHP extensions we need
# see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html

2
14.0/fpm-alpine/entrypoint.sh
View file

@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
else
mkdir -p $NEXTCLOUD_BASE_DIR
if [ -f /usr/sbin/apache2ctl ]; then
sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
fi
fi

2
14.0/fpm/Dockerfile
View file

@ -15,7 +15,7 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/*; \
\
mkdir -p /var/spool/cron/crontabs; \
echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
# install the PHP extensions we need
# see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html

2
14.0/fpm/entrypoint.sh
View file

@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
else
mkdir -p $NEXTCLOUD_BASE_DIR
if [ -f /usr/sbin/apache2ctl ]; then
sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
fi
fi

2
15.0/apache/Dockerfile
View file

@ -15,7 +15,7 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/*; \
\
mkdir -p /var/spool/cron/crontabs; \
echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
# install the PHP extensions we need
# see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html

2
15.0/apache/entrypoint.sh
View file

@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
else
mkdir -p $NEXTCLOUD_BASE_DIR
if [ -f /usr/sbin/apache2ctl ]; then
sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
fi
fi

2
15.0/fpm-alpine/Dockerfile
View file

@ -11,7 +11,7 @@ RUN set -ex; \
; \
\
rm /var/spool/cron/crontabs/root; \
echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
# install the PHP extensions we need
# see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html

2
15.0/fpm-alpine/entrypoint.sh
View file

@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
else
mkdir -p $NEXTCLOUD_BASE_DIR
if [ -f /usr/sbin/apache2ctl ]; then
sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
fi
fi

2
15.0/fpm/Dockerfile
View file

@ -15,7 +15,7 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/*; \
\
mkdir -p /var/spool/cron/crontabs; \
echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
# install the PHP extensions we need
# see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html

2
15.0/fpm/entrypoint.sh
View file

@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
else
mkdir -p $NEXTCLOUD_BASE_DIR
if [ -f /usr/sbin/apache2ctl ]; then
sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
fi
fi

2
16.0-alpha/apache/Dockerfile
View file

@ -15,7 +15,7 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/*; \
\
mkdir -p /var/spool/cron/crontabs; \
echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
# install the PHP extensions we need
# see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html

2
16.0-alpha/apache/entrypoint.sh
View file

@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
else
mkdir -p $NEXTCLOUD_BASE_DIR
if [ -f /usr/sbin/apache2ctl ]; then
sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
fi
fi

2
16.0-alpha/fpm-alpine/Dockerfile
View file

@ -11,7 +11,7 @@ RUN set -ex; \
; \
\
rm /var/spool/cron/crontabs/root; \
echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
# install the PHP extensions we need
# see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html

2
16.0-alpha/fpm-alpine/entrypoint.sh
View file

@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
else
mkdir -p $NEXTCLOUD_BASE_DIR
if [ -f /usr/sbin/apache2ctl ]; then
sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
fi
fi

2
16.0-alpha/fpm/Dockerfile
View file

@ -15,7 +15,7 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/*; \
\
mkdir -p /var/spool/cron/crontabs; \
echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
# install the PHP extensions we need
# see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html

2
16.0-alpha/fpm/entrypoint.sh
View file

@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
else
mkdir -p $NEXTCLOUD_BASE_DIR
if [ -f /usr/sbin/apache2ctl ]; then
sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
fi
fi

2
Dockerfile-alpine.template
View file

@ -10,7 +10,7 @@ RUN set -ex; \
; \
\
rm /var/spool/cron/crontabs/root; \
echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
# install the PHP extensions we need
# see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html

2
Dockerfile-debian.template
View file

@ -14,7 +14,7 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/*; \
\
mkdir -p /var/spool/cron/crontabs; \
echo '*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php' > /var/spool/cron/crontabs/www-data
echo "*/15 * * * * php -f ${NEXTCLOUD_BASE_DIR}/cron.php" > /var/spool/cron/crontabs/www-data
# install the PHP extensions we need
# see https://docs.nextcloud.com/server/12/admin_manual/installation/source_installation.html

2
docker-entrypoint.sh
View file

@ -24,7 +24,7 @@ if [ -z "${NEXTCLOUD_BASE_DIR}" ]; then
else
mkdir -p $NEXTCLOUD_BASE_DIR
if [ -f /usr/sbin/apache2ctl ]; then
sed -i "s,$NEXTCLOUD_BASE_DIR,$NEXTCLOUD_BASE_DIR/nextcloud,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/default-ssl.conf
sed -i "s,/var/www/html,$NEXTCLOUD_BASE_DIR,g" /etc/apache2/sites-available/000-default.conf
fi
fi