Merge branch '1.2'

.docker/bash/uvdesk-entrypoint.sh

@@ -12,32 +12,42 @@ declare -r COLOR_LIGHT_YELLOW='\033[0;33m'
 declare -r COLOR_BLUE='\033[0;34m'
 declare -r COLOR_LIGHT_BLUE='\033[1;34m'
 
+service mysql stop;
+usermod -d /var/lib/mysql/ mysql;
+
 # Restart apache & mysql server
 service apache2 restart && service mysql restart;
 
-if [[ ! -z "$MYSQL_USER" && ! -z "$MYSQL_PASSWORD" && ! -z "$MYSQL_DATABASE" ]]; then
-    if [ "$(mysqladmin ping)" == "mysqld is alive" ]; then
-        # Mysql is up and running with default configuration
-
-        # Create default database if not found and grant non-root user all privileges to that database
-        # Note: Grant privileges will create user if it doesn't exists prior to mysql 8
-        mysql -u root -e "CREATE DATABASE IF NOT EXISTS $MYSQL_DATABASE";
-        mysql -u root -e "GRANT ALL PRIVILEGES ON $MYSQL_DATABASE.* To '$MYSQL_USER'@'localhost' IDENTIFIED BY '$MYSQL_PASSWORD'";
-
-        # Update root user credentials
-        mysql -u root -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '$MYSQL_ROOT_PASSWORD'";
-
-        # Create new mysql configuration files (root & uvdesk)
-        rm -f /etc/mysql/my.cnf /home/uvdesk/.my.cnf \
-            && echo -e "[client]\nuser = root\npassword = $MYSQL_ROOT_PASSWORD\nhost = localhost" >> /etc/mysql/my.cnf \
-            && echo -e "[client]\nuser = $MYSQL_USER\npassword = $MYSQL_PASSWORD\nhost = localhost" >> /home/uvdesk/.my.cnf;
-    else
-        echo -e "${COLOR_RED}Error: Failed to establish a connection with mysql server (localhost)${COLOR_NC}\n";
-        exit 1;
-    fi
-else
-    echo -e "${COLOR_LIGHT_YELLOW}Notice: Skipping configuration of local database - one or more mysql environment variables are not defined.${COLOR_NC}\n";
-fi
+# @TODO: Debug. Returning access denied warning during container start up.
+# if [[ ! -z "$MYSQL_USER" && ! -z "$MYSQL_PASSWORD" && ! -z "$MYSQL_DATABASE" ]]; then
+#     if [ "$(mysqladmin ping)" == "mysqld is alive" ]; then
+#         # Mysql is up and running with default configuration
+
+#         # Update root & non-root user credentials. Grant non-root user all privileges to all database
+#         # Note: Grant privileges will create user if it doesn't exists prior to mysql 8
+#         mysql -u root -e "ALTER USER root@localhost IDENTIFIED WITH mysql_native_password BY '$MYSQL_ROOT_PASSWORD'";
+#         mysql -u root -e "CREATE USER uvdesk@localhost IDENTIFIED WITH mysql_native_password BY '$MYSQL_PASSWORD'";
+#         mysql -u root -e "GRANT ALL ON *.* To $MYSQL_USER@localhost";
+#         mysql -u root -e "UPDATE mysql.user SET host='%' WHERE user='$MYSQL_USER'";
+#         mysql -u root -e "FLUSH PRIVILEGES";
+
+#         service mysql restart;
+
+#         # Create default database if not found
+#         # mysql -u root -e "CREATE DATABASE IF NOT EXISTS $MYSQL_DATABASE";
+
+#         # Create new mysql configuration files (root & uvdesk)
+#         rm -f /etc/mysql/my.cnf /home/uvdesk/.my.cnf \
+#             && echo -e "[client]\nuser = root\npassword = $MYSQL_ROOT_PASSWORD\nhost = localhost" >> /etc/mysql/my.cnf \
+#             && echo -e "[client]\nuser = $MYSQL_USER\npassword = $MYSQL_PASSWORD\nhost = localhost" >> /home/uvdesk/.my.cnf;
+#     else
+#         echo -e "${COLOR_RED}Error: Failed to establish a connection with mysql server (localhost)${COLOR_NC}\n";
+#     fi
+# else
+#     echo -e "${COLOR_LIGHT_YELLOW}Notice: Skipping configuration of local database - one or more mysql environment variables are not defined.${COLOR_NC}\n";
+# fi
+
+chown uvdesk:uvdesk /var/www/uvdesk/.env;
 
 # Step down from sudo to uvdesk
 /usr/local/bin/gosu uvdesk "$@"

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:latest
 LABEL maintainer="[email protected]"
 
 ENV GOSU_VERSION 1.11