Skip to content

refactor check for non-empty workdir #393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
umlaeute wants to merge 2 commits into
base: master
Choose a base branch
from
Open

refactor check for non-empty workdir #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0270b2
refactor check for non-empty workdir
umlaeute Dec 17, 2025
993c26a
update entrypoint scripts for the various variants
umlaeute Dec 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 44 additions & 4 deletions apache/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,47 @@

# PWD=`pwd`

check_empty_docroot() {
local dirty_docroot_timeout=60

# check if ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT is valid
case "$(echo "${ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT}" | tr '[:upper:]' '[:lower:]')" in
yes|y|true|t|on|1)
# valid and truish: nothing to do
return 0
;;
no|n|false|f|off|0|"")
# valid and either falsish or unset: proceed to the test
;;
*)
# invalid; proceed
cat >&2 <<EOF
NOTE: ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT should either be 'yes' or 'no'
EOF
;;
esac
if find . -mindepth 1 -maxdepth 1 -print -quit | grep -q .; then
# non-empty docroot
if [ -z "${ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT}" ]; then
cat >&2 <<EOF
WARNING: '$PWD' is not empty
NOTE: set ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT to 'no' to stop immediately.
set ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT to 'yes' to proceed immediately.
NOTE: press Ctrl+C within ${dirty_docroot_timeout} seconds if this is an error!

EOF
( set -x; ls -A )
sleep "${dirty_docroot_timeout}"
else
cat >&2 <<EOF
ERROR: $PWD is not empty
NOTE: set ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT to 'yes' to ignore this.
EOF
exit 1
fi
fi
}

run_entrypoint_tasks() {
phase="$1"
shift
Expand Down Expand Up @@ -37,10 +78,9 @@ if [[ "$1" == apache2* || "$1" == php-fpm || "$1" == bin* ]]; then
# docroot is empty
if ! [ -e index.php -a -e bin/installto.sh ]; then
echo >&2 "roundcubemail not found in $PWD - copying now..."
if [ "$(ls -A)" ]; then
echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!"
( set -x; ls -A; sleep 10 )
fi

check_empty_docroot

tar cf - --one-file-system -C /usr/src/roundcubemail . | tar xf -
echo >&2 "Complete! ROUNDCUBEMAIL has been successfully copied to $INSTALLDIR"
# update Roundcube in docroot
Expand Down
48 changes: 44 additions & 4 deletions fpm-alpine/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,47 @@

# PWD=`pwd`

check_empty_docroot() {
local dirty_docroot_timeout=60

# check if ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT is valid
case "$(echo "${ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT}" | tr '[:upper:]' '[:lower:]')" in
yes|y|true|t|on|1)
# valid and truish: nothing to do
return 0
;;
no|n|false|f|off|0|"")
# valid and either falsish or unset: proceed to the test
;;
*)
# invalid; proceed
cat >&2 <<EOF
NOTE: ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT should either be 'yes' or 'no'
EOF
;;
esac
if find . -mindepth 1 -maxdepth 1 -print -quit | grep -q .; then
# non-empty docroot
if [ -z "${ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT}" ]; then
cat >&2 <<EOF
WARNING: '$PWD' is not empty
NOTE: set ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT to 'no' to stop immediately.
set ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT to 'yes' to proceed immediately.
NOTE: press Ctrl+C within ${dirty_docroot_timeout} seconds if this is an error!

EOF
( set -x; ls -A )
sleep "${dirty_docroot_timeout}"
else
cat >&2 <<EOF
ERROR: $PWD is not empty
NOTE: set ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT to 'yes' to ignore this.
EOF
exit 1
fi
fi
}

run_entrypoint_tasks() {
phase="$1"
shift
Expand Down Expand Up @@ -37,10 +78,9 @@ if [[ "$1" == apache2* || "$1" == php-fpm || "$1" == bin* ]]; then
# docroot is empty
if ! [ -e index.php -a -e bin/installto.sh ]; then
echo >&2 "roundcubemail not found in $PWD - copying now..."
if [ "$(ls -A)" ]; then
echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!"
( set -x; ls -A; sleep 10 )
fi

check_empty_docroot

tar cf - --one-file-system -C /usr/src/roundcubemail . | tar xf -
echo >&2 "Complete! ROUNDCUBEMAIL has been successfully copied to $INSTALLDIR"
# update Roundcube in docroot
Expand Down
48 changes: 44 additions & 4 deletions fpm/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,47 @@

# PWD=`pwd`

check_empty_docroot() {
local dirty_docroot_timeout=60

# check if ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT is valid
case "$(echo "${ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT}" | tr '[:upper:]' '[:lower:]')" in
yes|y|true|t|on|1)
# valid and truish: nothing to do
return 0
;;
no|n|false|f|off|0|"")
# valid and either falsish or unset: proceed to the test
;;
*)
# invalid; proceed
cat >&2 <<EOF
NOTE: ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT should either be 'yes' or 'no'
EOF
;;
esac
if find . -mindepth 1 -maxdepth 1 -print -quit | grep -q .; then
# non-empty docroot
if [ -z "${ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT}" ]; then
cat >&2 <<EOF
WARNING: '$PWD' is not empty
NOTE: set ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT to 'no' to stop immediately.
set ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT to 'yes' to proceed immediately.
NOTE: press Ctrl+C within ${dirty_docroot_timeout} seconds if this is an error!

EOF
( set -x; ls -A )
sleep "${dirty_docroot_timeout}"
else
cat >&2 <<EOF
ERROR: $PWD is not empty
NOTE: set ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT to 'yes' to ignore this.
EOF
exit 1
fi
fi
}

run_entrypoint_tasks() {
phase="$1"
shift
Expand Down Expand Up @@ -37,10 +78,9 @@ if [[ "$1" == apache2* || "$1" == php-fpm || "$1" == bin* ]]; then
# docroot is empty
if ! [ -e index.php -a -e bin/installto.sh ]; then
echo >&2 "roundcubemail not found in $PWD - copying now..."
if [ "$(ls -A)" ]; then
echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!"
( set -x; ls -A; sleep 10 )
fi

check_empty_docroot

tar cf - --one-file-system -C /usr/src/roundcubemail . | tar xf -
echo >&2 "Complete! ROUNDCUBEMAIL has been successfully copied to $INSTALLDIR"
# update Roundcube in docroot
Expand Down
48 changes: 44 additions & 4 deletions templates/docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,47 @@

# PWD=`pwd`

check_empty_docroot() {
local dirty_docroot_timeout=60

# check if ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT is valid
case "$(echo "${ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT}" | tr '[:upper:]' '[:lower:]')" in
yes|y|true|t|on|1)
# valid and truish: nothing to do
return 0
;;
no|n|false|f|off|0|"")
# valid and either falsish or unset: proceed to the test
;;
*)
# invalid; proceed
cat >&2 <<EOF
NOTE: ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT should either be 'yes' or 'no'
EOF
;;
esac
if find . -mindepth 1 -maxdepth 1 -print -quit | grep -q .; then
# non-empty docroot
if [ -z "${ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT}" ]; then
cat >&2 <<EOF
WARNING: '$PWD' is not empty
NOTE: set ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT to 'no' to stop immediately.
set ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT to 'yes' to proceed immediately.
NOTE: press Ctrl+C within ${dirty_docroot_timeout} seconds if this is an error!

EOF
( set -x; ls -A )
sleep "${dirty_docroot_timeout}"
else
cat >&2 <<EOF
ERROR: $PWD is not empty
NOTE: set ROUNDCUBEMAIL_ALLOW_DIRTY_DOCROOT to 'yes' to ignore this.
EOF
exit 1
fi
fi
}

run_entrypoint_tasks() {
phase="$1"
shift
Expand Down Expand Up @@ -37,10 +78,9 @@ if [[ "$1" == apache2* || "$1" == php-fpm || "$1" == bin* ]]; then
# docroot is empty
if ! [ -e index.php -a -e bin/installto.sh ]; then
echo >&2 "roundcubemail not found in $PWD - copying now..."
if [ "$(ls -A)" ]; then
echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!"
( set -x; ls -A; sleep 10 )
fi

check_empty_docroot

tar cf - --one-file-system -C /usr/src/roundcubemail . | tar xf -
echo >&2 "Complete! ROUNDCUBEMAIL has been successfully copied to $INSTALLDIR"
# update Roundcube in docroot
Expand Down
Loading