joomla/docker
34
3
Fork 0
mirror of https://github.com/joomla-docker/docker-joomla.git synced 2025-01-25 08:08:41 +00:00
Code Issues Releases Activity

Moves user check into Apache usecase.

Browse Source
This commit is contained in:
Llewellyn van der Merwe 2022-01-20 14:14:08 +02:00
parent 6b42540f50
commit 66e04002a2
Signed by: Llewellyn
GPG Key ID: EFC0C720A240551C
13 changed files with 182 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
3.10/php7.3/apache/docker-entrypoint.sh
View File

@ -18,16 +18,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
pound='#' pound='#'
user="${user#$pound}" user="${user#$pound}"
group="${group#$pound}" group="${group#$pound}"
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
# set user if not exist # set user if not exist
if ! id "$user" &>/dev/null; then if ! id "$user" &>/dev/null; then
# get the user name # get the user name
@ -41,6 +32,16 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
# update the user-group ID # update the user-group ID
usermod -o -u "$group" "$USER_NAME" usermod -o -u "$group" "$USER_NAME"
fi fi
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
if [ -n "$MYSQL_PORT_3306_TCP" ]; then if [ -n "$MYSQL_PORT_3306_TCP" ]; then
if [ -z "$JOOMLA_DB_HOST" ]; then if [ -z "$JOOMLA_DB_HOST" ]; then

21
3.10/php7.3/fpm-alpine/docker-entrypoint.sh
View File

@ -18,16 +18,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
pound='#' pound='#'
user="${user#$pound}" user="${user#$pound}"
group="${group#$pound}" group="${group#$pound}"
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
# set user if not exist # set user if not exist
if ! id "$user" &>/dev/null; then if ! id "$user" &>/dev/null; then
# get the user name # get the user name
@ -41,6 +32,16 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
# update the user-group ID # update the user-group ID
usermod -o -u "$group" "$USER_NAME" usermod -o -u "$group" "$USER_NAME"
fi fi
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
if [ -n "$MYSQL_PORT_3306_TCP" ]; then if [ -n "$MYSQL_PORT_3306_TCP" ]; then
if [ -z "$JOOMLA_DB_HOST" ]; then if [ -z "$JOOMLA_DB_HOST" ]; then

21
3.10/php7.3/fpm/docker-entrypoint.sh
View File

@ -18,16 +18,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
pound='#' pound='#'
user="${user#$pound}" user="${user#$pound}"
group="${group#$pound}" group="${group#$pound}"
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
# set user if not exist # set user if not exist
if ! id "$user" &>/dev/null; then if ! id "$user" &>/dev/null; then
# get the user name # get the user name
@ -41,6 +32,16 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
# update the user-group ID # update the user-group ID
usermod -o -u "$group" "$USER_NAME" usermod -o -u "$group" "$USER_NAME"
fi fi
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
if [ -n "$MYSQL_PORT_3306_TCP" ]; then if [ -n "$MYSQL_PORT_3306_TCP" ]; then
if [ -z "$JOOMLA_DB_HOST" ]; then if [ -z "$JOOMLA_DB_HOST" ]; then

21
3.10/php7.4/apache/docker-entrypoint.sh
View File

@ -18,16 +18,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
pound='#' pound='#'
user="${user#$pound}" user="${user#$pound}"
group="${group#$pound}" group="${group#$pound}"
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
# set user if not exist # set user if not exist
if ! id "$user" &>/dev/null; then if ! id "$user" &>/dev/null; then
# get the user name # get the user name
@ -41,6 +32,16 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
# update the user-group ID # update the user-group ID
usermod -o -u "$group" "$USER_NAME" usermod -o -u "$group" "$USER_NAME"
fi fi
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
if [ -n "$MYSQL_PORT_3306_TCP" ]; then if [ -n "$MYSQL_PORT_3306_TCP" ]; then
if [ -z "$JOOMLA_DB_HOST" ]; then if [ -z "$JOOMLA_DB_HOST" ]; then

21
3.10/php7.4/fpm-alpine/docker-entrypoint.sh
View File

@ -18,16 +18,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
pound='#' pound='#'
user="${user#$pound}" user="${user#$pound}"
group="${group#$pound}" group="${group#$pound}"
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
# set user if not exist # set user if not exist
if ! id "$user" &>/dev/null; then if ! id "$user" &>/dev/null; then
# get the user name # get the user name
@ -41,6 +32,16 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
# update the user-group ID # update the user-group ID
usermod -o -u "$group" "$USER_NAME" usermod -o -u "$group" "$USER_NAME"
fi fi
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
if [ -n "$MYSQL_PORT_3306_TCP" ]; then if [ -n "$MYSQL_PORT_3306_TCP" ]; then
if [ -z "$JOOMLA_DB_HOST" ]; then if [ -z "$JOOMLA_DB_HOST" ]; then

21
3.10/php7.4/fpm/docker-entrypoint.sh
View File

@ -18,16 +18,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
pound='#' pound='#'
user="${user#$pound}" user="${user#$pound}"
group="${group#$pound}" group="${group#$pound}"
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
# set user if not exist # set user if not exist
if ! id "$user" &>/dev/null; then if ! id "$user" &>/dev/null; then
# get the user name # get the user name
@ -41,6 +32,16 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
# update the user-group ID # update the user-group ID
usermod -o -u "$group" "$USER_NAME" usermod -o -u "$group" "$USER_NAME"
fi fi
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
if [ -n "$MYSQL_PORT_3306_TCP" ]; then if [ -n "$MYSQL_PORT_3306_TCP" ]; then
if [ -z "$JOOMLA_DB_HOST" ]; then if [ -z "$JOOMLA_DB_HOST" ]; then

21
4.0/php7.4/apache/docker-entrypoint.sh
View File

@ -18,16 +18,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
pound='#' pound='#'
user="${user#$pound}" user="${user#$pound}"
group="${group#$pound}" group="${group#$pound}"
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
# set user if not exist # set user if not exist
if ! id "$user" &>/dev/null; then if ! id "$user" &>/dev/null; then
# get the user name # get the user name
@ -41,6 +32,16 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
# update the user-group ID # update the user-group ID
usermod -o -u "$group" "$USER_NAME" usermod -o -u "$group" "$USER_NAME"
fi fi
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
if [ -n "$MYSQL_PORT_3306_TCP" ]; then if [ -n "$MYSQL_PORT_3306_TCP" ]; then
if [ -z "$JOOMLA_DB_HOST" ]; then if [ -z "$JOOMLA_DB_HOST" ]; then

21
4.0/php7.4/fpm-alpine/docker-entrypoint.sh
View File

@ -18,16 +18,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
pound='#' pound='#'
user="${user#$pound}" user="${user#$pound}"
group="${group#$pound}" group="${group#$pound}"
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
# set user if not exist # set user if not exist
if ! id "$user" &>/dev/null; then if ! id "$user" &>/dev/null; then
# get the user name # get the user name
@ -41,6 +32,16 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
# update the user-group ID # update the user-group ID
usermod -o -u "$group" "$USER_NAME" usermod -o -u "$group" "$USER_NAME"
fi fi
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
if [ -n "$MYSQL_PORT_3306_TCP" ]; then if [ -n "$MYSQL_PORT_3306_TCP" ]; then
if [ -z "$JOOMLA_DB_HOST" ]; then if [ -z "$JOOMLA_DB_HOST" ]; then

21
4.0/php7.4/fpm/docker-entrypoint.sh
View File

@ -18,16 +18,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
pound='#' pound='#'
user="${user#$pound}" user="${user#$pound}"
group="${group#$pound}" group="${group#$pound}"
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
# set user if not exist # set user if not exist
if ! id "$user" &>/dev/null; then if ! id "$user" &>/dev/null; then
# get the user name # get the user name
@ -41,6 +32,16 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
# update the user-group ID # update the user-group ID
usermod -o -u "$group" "$USER_NAME" usermod -o -u "$group" "$USER_NAME"
fi fi
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
if [ -n "$MYSQL_PORT_3306_TCP" ]; then if [ -n "$MYSQL_PORT_3306_TCP" ]; then
if [ -z "$JOOMLA_DB_HOST" ]; then if [ -z "$JOOMLA_DB_HOST" ]; then

21
4.0/php8.0/apache/docker-entrypoint.sh
View File

@ -18,16 +18,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
pound='#' pound='#'
user="${user#$pound}" user="${user#$pound}"
group="${group#$pound}" group="${group#$pound}"
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
# set user if not exist # set user if not exist
if ! id "$user" &>/dev/null; then if ! id "$user" &>/dev/null; then
# get the user name # get the user name
@ -41,6 +32,16 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
# update the user-group ID # update the user-group ID
usermod -o -u "$group" "$USER_NAME" usermod -o -u "$group" "$USER_NAME"
fi fi
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
if [ -n "$MYSQL_PORT_3306_TCP" ]; then if [ -n "$MYSQL_PORT_3306_TCP" ]; then
if [ -z "$JOOMLA_DB_HOST" ]; then if [ -z "$JOOMLA_DB_HOST" ]; then

21
4.0/php8.0/fpm-alpine/docker-entrypoint.sh
View File

@ -18,16 +18,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
pound='#' pound='#'
user="${user#$pound}" user="${user#$pound}"
group="${group#$pound}" group="${group#$pound}"
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
# set user if not exist # set user if not exist
if ! id "$user" &>/dev/null; then if ! id "$user" &>/dev/null; then
# get the user name # get the user name
@ -41,6 +32,16 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
# update the user-group ID # update the user-group ID
usermod -o -u "$group" "$USER_NAME" usermod -o -u "$group" "$USER_NAME"
fi fi
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
if [ -n "$MYSQL_PORT_3306_TCP" ]; then if [ -n "$MYSQL_PORT_3306_TCP" ]; then
if [ -z "$JOOMLA_DB_HOST" ]; then if [ -z "$JOOMLA_DB_HOST" ]; then

21
4.0/php8.0/fpm/docker-entrypoint.sh
View File

@ -18,16 +18,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
pound='#' pound='#'
user="${user#$pound}" user="${user#$pound}"
group="${group#$pound}" group="${group#$pound}"
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
# set user if not exist # set user if not exist
if ! id "$user" &>/dev/null; then if ! id "$user" &>/dev/null; then
# get the user name # get the user name
@ -41,6 +32,16 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
# update the user-group ID # update the user-group ID
usermod -o -u "$group" "$USER_NAME" usermod -o -u "$group" "$USER_NAME"
fi fi
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
if [ -n "$MYSQL_PORT_3306_TCP" ]; then if [ -n "$MYSQL_PORT_3306_TCP" ]; then
if [ -z "$JOOMLA_DB_HOST" ]; then if [ -z "$JOOMLA_DB_HOST" ]; then

21
docker-entrypoint.sh
View File

@ -18,16 +18,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
pound='#' pound='#'
user="${user#$pound}" user="${user#$pound}"
group="${group#$pound}" group="${group#$pound}"
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
# set user if not exist # set user if not exist
if ! id "$user" &>/dev/null; then if ! id "$user" &>/dev/null; then
# get the user name # get the user name
@ -41,6 +32,16 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
# update the user-group ID # update the user-group ID
usermod -o -u "$group" "$USER_NAME" usermod -o -u "$group" "$USER_NAME"
fi fi
;;
*) # php-fpm
user='www-data'
group='www-data'
;;
esac
else
user="$uid"
group="$gid"
fi
if [ -n "$MYSQL_PORT_3306_TCP" ]; then if [ -n "$MYSQL_PORT_3306_TCP" ]; then
if [ -z "$JOOMLA_DB_HOST" ]; then if [ -z "$JOOMLA_DB_HOST" ]; then