Skip to content

Commit 5bbbde3

Browse files
boomer41boomer41
committed
Add pre-initialization hook
Allow execution of scripts even before the need to install or update Nextcloud is determined. Useful when needing to have additional update condition checks. Signed-off-by: Stephan Brunner <s.brunner@stephan-brunner.net>
1 parent 86ab9d7 commit 5bbbde3

22 files changed

+45
-12
lines changed

‎29/apache/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ RUN { \
140140
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
141141
\
142142
mkdir /var/www/data; \
143-
mkdir -p /docker-entrypoint-hooks.d/pre-installation \
143+
mkdir -p /docker-entrypoint-hooks.d/pre-initialization \
144+
/docker-entrypoint-hooks.d/pre-installation \
144145
/docker-entrypoint-hooks.d/post-installation \
145146
/docker-entrypoint-hooks.d/pre-upgrade \
146147
/docker-entrypoint-hooks.d/post-upgrade \

‎29/apache/entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
141141
flock 9
142142
fi
143143

144+
run_path pre-initialization
145+
144146
installed_version="0.0.0.0"
145147
if [ -f /var/www/html/version.php ]; then
146148
# shellcheck disable=SC2016

‎29/fpm-alpine/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,8 @@ RUN { \
135135
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
136136
\
137137
mkdir /var/www/data; \
138-
mkdir -p /docker-entrypoint-hooks.d/pre-installation \
138+
mkdir -p /docker-entrypoint-hooks.d/pre-initialization \
139+
/docker-entrypoint-hooks.d/pre-installation \
139140
/docker-entrypoint-hooks.d/post-installation \
140141
/docker-entrypoint-hooks.d/pre-upgrade \
141142
/docker-entrypoint-hooks.d/post-upgrade \

‎29/fpm-alpine/entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
141141
flock 9
142142
fi
143143

144+
run_path pre-initialization
145+
144146
installed_version="0.0.0.0"
145147
if [ -f /var/www/html/version.php ]; then
146148
# shellcheck disable=SC2016

‎29/fpm/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ RUN { \
140140
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
141141
\
142142
mkdir /var/www/data; \
143-
mkdir -p /docker-entrypoint-hooks.d/pre-installation \
143+
mkdir -p /docker-entrypoint-hooks.d/pre-initialization \
144+
/docker-entrypoint-hooks.d/pre-installation \
144145
/docker-entrypoint-hooks.d/post-installation \
145146
/docker-entrypoint-hooks.d/pre-upgrade \
146147
/docker-entrypoint-hooks.d/post-upgrade \

‎29/fpm/entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
141141
flock 9
142142
fi
143143

144+
run_path pre-initialization
145+
144146
installed_version="0.0.0.0"
145147
if [ -f /var/www/html/version.php ]; then
146148
# shellcheck disable=SC2016

‎30/apache/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ RUN { \
140140
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
141141
\
142142
mkdir /var/www/data; \
143-
mkdir -p /docker-entrypoint-hooks.d/pre-installation \
143+
mkdir -p /docker-entrypoint-hooks.d/pre-initialization \
144+
/docker-entrypoint-hooks.d/pre-installation \
144145
/docker-entrypoint-hooks.d/post-installation \
145146
/docker-entrypoint-hooks.d/pre-upgrade \
146147
/docker-entrypoint-hooks.d/post-upgrade \

‎30/apache/entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
141141
flock 9
142142
fi
143143

144+
run_path pre-initialization
145+
144146
installed_version="0.0.0.0"
145147
if [ -f /var/www/html/version.php ]; then
146148
# shellcheck disable=SC2016

‎30/fpm-alpine/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,8 @@ RUN { \
135135
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
136136
\
137137
mkdir /var/www/data; \
138-
mkdir -p /docker-entrypoint-hooks.d/pre-installation \
138+
mkdir -p /docker-entrypoint-hooks.d/pre-initialization \
139+
/docker-entrypoint-hooks.d/pre-installation \
139140
/docker-entrypoint-hooks.d/post-installation \
140141
/docker-entrypoint-hooks.d/pre-upgrade \
141142
/docker-entrypoint-hooks.d/post-upgrade \

‎30/fpm-alpine/entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
141141
flock 9
142142
fi
143143

144+
run_path pre-initialization
145+
144146
installed_version="0.0.0.0"
145147
if [ -f /var/www/html/version.php ]; then
146148
# shellcheck disable=SC2016

‎30/fpm/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ RUN { \
140140
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
141141
\
142142
mkdir /var/www/data; \
143-
mkdir -p /docker-entrypoint-hooks.d/pre-installation \
143+
mkdir -p /docker-entrypoint-hooks.d/pre-initialization \
144+
/docker-entrypoint-hooks.d/pre-installation \
144145
/docker-entrypoint-hooks.d/post-installation \
145146
/docker-entrypoint-hooks.d/pre-upgrade \
146147
/docker-entrypoint-hooks.d/post-upgrade \

‎30/fpm/entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
141141
flock 9
142142
fi
143143

144+
run_path pre-initialization
145+
144146
installed_version="0.0.0.0"
145147
if [ -f /var/www/html/version.php ]; then
146148
# shellcheck disable=SC2016

‎31/apache/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ RUN { \
140140
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
141141
\
142142
mkdir /var/www/data; \
143-
mkdir -p /docker-entrypoint-hooks.d/pre-installation \
143+
mkdir -p /docker-entrypoint-hooks.d/pre-initialization \
144+
/docker-entrypoint-hooks.d/pre-installation \
144145
/docker-entrypoint-hooks.d/post-installation \
145146
/docker-entrypoint-hooks.d/pre-upgrade \
146147
/docker-entrypoint-hooks.d/post-upgrade \

‎31/apache/entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
141141
flock 9
142142
fi
143143

144+
run_path pre-initialization
145+
144146
installed_version="0.0.0.0"
145147
if [ -f /var/www/html/version.php ]; then
146148
# shellcheck disable=SC2016

‎31/fpm-alpine/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,8 @@ RUN { \
135135
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
136136
\
137137
mkdir /var/www/data; \
138-
mkdir -p /docker-entrypoint-hooks.d/pre-installation \
138+
mkdir -p /docker-entrypoint-hooks.d/pre-initialization \
139+
/docker-entrypoint-hooks.d/pre-installation \
139140
/docker-entrypoint-hooks.d/post-installation \
140141
/docker-entrypoint-hooks.d/pre-upgrade \
141142
/docker-entrypoint-hooks.d/post-upgrade \

‎31/fpm-alpine/entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
141141
flock 9
142142
fi
143143

144+
run_path pre-initialization
145+
144146
installed_version="0.0.0.0"
145147
if [ -f /var/www/html/version.php ]; then
146148
# shellcheck disable=SC2016

‎31/fpm/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ RUN { \
140140
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
141141
\
142142
mkdir /var/www/data; \
143-
mkdir -p /docker-entrypoint-hooks.d/pre-installation \
143+
mkdir -p /docker-entrypoint-hooks.d/pre-initialization \
144+
/docker-entrypoint-hooks.d/pre-installation \
144145
/docker-entrypoint-hooks.d/post-installation \
145146
/docker-entrypoint-hooks.d/pre-upgrade \
146147
/docker-entrypoint-hooks.d/post-upgrade \

‎31/fpm/entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
141141
flock 9
142142
fi
143143

144+
run_path pre-initialization
145+
144146
installed_version="0.0.0.0"
145147
if [ -f /var/www/html/version.php ]; then
146148
# shellcheck disable=SC2016

‎Dockerfile-alpine.template

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ RUN { \
134134
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
135135
\
136136
mkdir /var/www/data; \
137-
mkdir -p /docker-entrypoint-hooks.d/pre-installation \
137+
mkdir -p /docker-entrypoint-hooks.d/pre-initialization \
138+
/docker-entrypoint-hooks.d/pre-installation \
138139
/docker-entrypoint-hooks.d/post-installation \
139140
/docker-entrypoint-hooks.d/pre-upgrade \
140141
/docker-entrypoint-hooks.d/post-upgrade \

‎Dockerfile-debian.template

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ RUN { \
139139
} > "${PHP_INI_DIR}/conf.d/nextcloud.ini"; \
140140
\
141141
mkdir /var/www/data; \
142-
mkdir -p /docker-entrypoint-hooks.d/pre-installation \
142+
mkdir -p /docker-entrypoint-hooks.d/pre-initialization \
143+
/docker-entrypoint-hooks.d/pre-installation \
143144
/docker-entrypoint-hooks.d/post-installation \
144145
/docker-entrypoint-hooks.d/pre-upgrade \
145146
/docker-entrypoint-hooks.d/post-upgrade \

‎README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,8 +362,9 @@ As long as you have not modified any of the provided config files in `/var/www/h
362362

363363
## Auto configuration via hook folders
364364

365-
There are 5 hooks
365+
There are 6 hooks
366366

367+
- `pre-initialization` Executed before the need to update or install Nextcloud is determined
367368
- `pre-installation` Executed before the Nextcloud is installed/initiated
368369
- `post-installation` Executed after the Nextcloud is installed/initiated
369370
- `pre-upgrade` Executed before the Nextcloud is upgraded
@@ -383,6 +384,7 @@ To use the hooks triggered by the `entrypoint` script, either
383384
image: nextcloud:stable
384385

385386
volumes:
387+
- ./app-hooks/pre-initialization:/docker-entrypoint-hooks.d/pre-initialization
386388
- ./app-hooks/pre-installation:/docker-entrypoint-hooks.d/pre-installation
387389
- ./app-hooks/post-installation:/docker-entrypoint-hooks.d/post-installation
388390
- ./app-hooks/pre-upgrade:/docker-entrypoint-hooks.d/pre-upgrade

‎docker-entrypoint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
141141
flock 9
142142
fi
143143

144+
run_path pre-initialization
145+
144146
installed_version="0.0.0.0"
145147
if [ -f /var/www/html/version.php ]; then
146148
# shellcheck disable=SC2016

0 commit comments

Comments
 (0)