Merge pull request #27 from thelamer/master

adding optional ability to setup a database on first spinup

Author: aptalca

README.md

@@ -55,6 +55,9 @@ docker create \
   -e PGID=1000 \
   -e MYSQL_ROOT_PASSWORD=<DATABASE PASSWORD> \
   -e TZ=Europe/London \
+  -e MYSQL_DATABASE=<USER DB NAME> `#optional` \
+  -e MYSQL_USER=<MYSQL USER> `#optional` \
+  -e MYSQL_PASSWORD=<DATABASE PASSWORD> `#optional` \
   -p 3306:3306 \
   -v <path to data>:/config \
   --restart unless-stopped \
@@ -78,6 +81,9 @@ services:
       - PGID=1000
       - MYSQL_ROOT_PASSWORD=<DATABASE PASSWORD>
       - TZ=Europe/London
+      - MYSQL_DATABASE=<USER DB NAME> #optional
+      - MYSQL_USER=<MYSQL USER> #optional
+      - MYSQL_PASSWORD=<DATABASE PASSWORD> #optional
     volumes:
       - <path to data>:/config
     ports:
@@ -96,6 +102,9 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e MYSQL_ROOT_PASSWORD=<DATABASE PASSWORD>` | Set this to root password for installation (minimum 4 characters). |
 | `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London. |
+| `-e MYSQL_DATABASE=<USER DB NAME>` | Specify the name of a database to be created on image startup. |
+| `-e MYSQL_USER=<MYSQL USER>` | This user will have superuser access to the database specified by MYSQL_DATABASE. |
+| `-e MYSQL_PASSWORD=<DATABASE PASSWORD>` | Set this to the password you want to use for you MYSQL_USER (minimum 4 characters). |
 | `-v /config` | Contains the db itself and all assorted settings. |
 
 ## User / Group Identifiers
@@ -121,6 +130,8 @@ to set one at the docker prompt...
 
 NOTE changing the MYSQL_ROOT_PASSWORD variable after the container has set up the initial databases has no effect, use the mysqladmin tool to change your mariadb password.
 
+NOTE if you want to use (MYSQL_DATABASE MYSQL_USER MYSQL_PASSWORD) **all three** of these variables need to be set you cannot pick and choose.
+
 Unraid users, it is advisable to edit the template/webui after setup and remove reference to this variable.
 
 Find custom.cnf in /config for config changes (restart container for them to take effect)
@@ -169,6 +180,7 @@ Below are the instructions for updating containers:
 
 ## Versions
 
+* **07.03.19:** - Add ability to setup a database and default user on first spinup.
 * **26.01.19:** - Add pipeline logic and multi arch.
 * **10.09.18:** - Rebase to ubuntu bionic and use 10.3 mariadb repository.
 * **09.12.17:** - Fix continuation lines.

readme-vars.yml

@@ -35,7 +35,11 @@ param_device_map: false
 cap_add_param: false
 
 # optional container parameters
-opt_param_usage_include_env: false
+opt_param_usage_include_env: true
+opt_param_env_vars:
+  - { env_var: "MYSQL_DATABASE", env_value: "<USER DB NAME>", desc: "Specify the name of a database to be created on image startup." }
+  - { env_var: "MYSQL_USER", env_value: "<MYSQL USER>", desc: "This user will have superuser access to the database specified by MYSQL_DATABASE." }
+  - { env_var: "MYSQL_PASSWORD", env_value: "<DATABASE PASSWORD>", desc: "Set this to the password you want to use for you MYSQL_USER (minimum 4 characters)." }
 opt_param_usage_include_vols: false
 opt_param_usage_include_ports: false
 opt_param_device_map: false
@@ -51,13 +55,16 @@ app_setup_block: |
 
   NOTE changing the MYSQL_ROOT_PASSWORD variable after the container has set up the initial databases has no effect, use the mysqladmin tool to change your mariadb password.
 
+  NOTE if you want to use (MYSQL_DATABASE MYSQL_USER MYSQL_PASSWORD) **all three** of these variables need to be set you cannot pick and choose.
+
   Unraid users, it is advisable to edit the template/webui after setup and remove reference to this variable.
 
   Find custom.cnf in /config for config changes (restart container for them to take effect)
   , the databases in /config/databases and the log in /config/log/myqsl
 
 # changelog
 changelogs:
+  - { date: "07.03.19:", desc: "Add ability to setup a database and default user on first spinup." }
   - { date: "26.01.19:", desc: "Add pipeline logic and multi arch." }
   - { date: "10.09.18:", desc: "Rebase to ubuntu bionic and use 10.3 mariadb repository." }
   - { date: "09.12.17:", desc: "Fix continuation lines." }

root/etc/cont-init.d/30_config renamed to root/etc/cont-init.d/30-config

@@ -44,8 +44,21 @@ else
 MYSQL_PASS="CREATE USER 'root'@'%' IDENTIFIED BY '${MYSQL_ROOT_PASSWORD}' ;"
 fi
 
+# Make sure all user and database settings are set and pass is more than 4 characters
+if [ "${MYSQL_USER+x}" ] && \
+[ "${MYSQL_DATABASE+x}" ] && \
+[ "${MYSQL_PASSWORD+x}" ] && \
+[ "${#MYSQL_PASSWORD}" -gt "4" ]; then
+read -r -d '' MYSQL_DB_SETUP << EOM
+CREATE DATABASE ${MYSQL_DATABASE};
+CREATE USER '${MYSQL_USER}'@'%' IDENTIFIED BY '${MYSQL_PASSWORD}';
+GRANT ALL PRIVILEGES ON ${MYSQL_DATABASE}.* TO '${MYSQL_USER}'@'%';
+EOM
+fi
+
 # add rest of sql commands based on password set or not
 cat >> "$tempSqlFile" <<-EONEWSQL
+$MYSQL_DB_SETUP
 $MYSQL_PASS
 GRANT ALL ON *.* TO 'root'@'%' WITH GRANT OPTION ;
 DROP DATABASE IF EXISTS test ;