Use the official Mariadb image as base for ddev-dbserver (#1476)

* Use official docker mariadb container as base
* Update starter files for 10.1 and 10.2
* Bump version.go version

containers/ddev-dbserver/10.1/Dockerfile

@@ -1,15 +1,12 @@
-FROM alpine:3.7
+FROM mariadb:10.1.38-bionic
 
 ENV MYSQL_DATABASE db
 ENV MYSQL_USER db
 ENV MYSQL_PASSWORD db
 ENV MYSQL_ROOT_PASSWORD root
-ENV MARIADB_VERSION 10.1
-ENV MARIADB_FULL_VERSION 10.1.37-r0
 
 # Install mariadb and other packages
-RUN apk add --no-cache mariadb=$MARIADB_FULL_VERSION mariadb-client=$MARIADB_FULL_VERSION bash tzdata shadow sudo pv
-# Remove the installed version as we need to set up our own from scratch
+RUN apt-get update && apt-get install -y tzdata sudo pv
 
 RUN rm -rf /var/lib/mysql/* /etc/mysql
 RUN mkdir -p /var/lib/mysql && chmod 777 /var/lib/mysql

containers/ddev-dbserver/10.1/files/create_base_db.sh

@@ -24,7 +24,7 @@ sudo chmod ugo+w /var/tmp
 sudo mkdir -p /var/lib/mysql /mnt/ddev_config/mysql && sudo rm -f /var/lib/mysql/* && sudo chmod -R ugo+w /var/lib/mysql
 
 echo 'Initializing mysql'
-mysql_install_db
+mysql_install_db --force
 echo 'Starting mysqld --skip-networking'
 mysqld --skip-networking &
 pid="$!"

containers/ddev-dbserver/10.1/files/var/tmp/mysqlbase/mysql/db.MYD

@@ -1 +1 @@
-�%                                                                                                                                                                                   test                                                                                                                                                                                                                                                                                                                                                                                                                                            


�%                                                                                                                                                                                   test\_%                                                                                                                                                                                                                                                                                                                                                                                                                                         


�%                                                                                                                                                                                   db                                                                                                                                                                                              db                                                                                                                                                                                                                                              
�localhost                                                                                                                                                                           db                                                                                                                                                                                              db                                                                                                                                                                                                                                              

+�%                                                                                                                                                                                   db                                                                                                                                                                                              db                                                                                                                                                                                                                                              
�localhost                                                                                                                                                                           db                                                                                                                                                                                              db                                                                                                                                                                                                                                              


containers/ddev-dbserver/10.1/files/var/tmp/mysqlbase/mysql/proxies_priv.MYD

@@ -1 +1 @@
-�localhost                                                                                                                                                                           root                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
                                                                                                                                                                                                                                                                                                                                                                                                                                       \[[��109aad34ef3c                                                                                                                                                                        root                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
                                                                                                                                                                                                                                                                                                                                                                                                                                       \[[�
+�localhost                                                                                                                                                                           root                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
                                                                                                                                                                                                                                                                                                                                                                                                                                       \v�=�6e26827bd877                                                                                                                                                                        root                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                
                                                                                                                                                                                                                                                                                                                                                                                                                                       \v�=

containers/ddev-dbserver/10.1/files/var/tmp/mysqlbase/xtrabackup_binlog_info

@@ -1 +1 @@
-on.000004	4206934	0-1-4734
+on.000004	6529594	0-1-7250

containers/ddev-dbserver/10.1/files/var/tmp/mysqlbase/xtrabackup_info

@@ -1,14 +1,14 @@
-uuid = 3598fc8f-2a5c-11e9-9b3a-0242ac110002
+uuid = 757e10a1-3ace-11e9-aa9a-0242ac110002
 name = 
 tool_name = mariabackup
 tool_command = --backup --target-dir=/mysqlbase --user root --password=... root --socket=/var/tmp/mysql.sock
-tool_version = 10.1.37-MariaDB
-ibbackup_version = 10.1.37-MariaDB
-server_version = 10.1.37-MariaDB
-start_time = 2019-02-06 22:11:51
-end_time = 2019-02-06 22:11:53
+tool_version = 10.1.38-MariaDB
+ibbackup_version = 10.1.38-MariaDB
+server_version = 10.1.38-MariaDB-1~bionic
+start_time = 2019-02-27 20:30:00
+end_time = 2019-02-27 20:30:02
 lock_time = 0
-binlog_pos = filename 'on.000004', position '4206934', GTID of the last change '0-1-4734'
+binlog_pos = filename 'on.000004', position '6529594', GTID of the last change '0-1-7250'
 innodb_from_lsn = 0
 innodb_to_lsn = 1616727
 partial = N

containers/ddev-dbserver/10.2/Dockerfile

@@ -1,15 +1,12 @@
-FROM alpine:3.8
+FROM mariadb:10.2.22
 
 ENV MYSQL_DATABASE db
 ENV MYSQL_USER db
 ENV MYSQL_PASSWORD db
 ENV MYSQL_ROOT_PASSWORD root
-ENV MARIADB_VERSION 10.2
-ENV MARIADB_FULL_VERSION 10.2.19-r1
 
 # Install mariadb and other packages
-RUN apk add --no-cache mariadb=$MARIADB_FULL_VERSION mariadb-client=$MARIADB_FULL_VERSION mariadb-backup=$MARIADB_FULL_VERSION mariadb-server-utils=$MARIADB_FULL_VERSION bash tzdata shadow sudo pv
-# Remove the installed version as we need to set up our own from scratch
+RUN apt-get update && apt-get install -y tzdata sudo pv
 
 RUN rm -rf /var/lib/mysql/* /etc/mysql
 RUN mkdir -p /var/lib/mysql && chmod 777 /var/lib/mysql

containers/ddev-dbserver/10.2/files/create_base_db.sh

@@ -24,7 +24,7 @@ sudo chmod ugo+w /var/tmp
 sudo mkdir -p /var/lib/mysql /mnt/ddev_config/mysql && sudo rm -f /var/lib/mysql/* && sudo chmod -R ugo+w /var/lib/mysql
 
 echo 'Initializing mysql'
-mysql_install_db
+mysql_install_db --force
 echo 'Starting mysqld --skip-networking'
 mysqld --skip-networking &
 pid="$!"

containers/ddev-dbserver/10.2/files/var/tmp/mysqlbase/mysql/db.MYD

@@ -1 +1 @@
-�%                                                                                                                                                                                   test                                                                                                                                                                                                                                                                                                                                                                                                                                            


�%                                                                                                                                                                                   test\_%                                                                                                                                                                                                                                                                                                                                                                                                                                         


�%                                                                                                                                                                                   db                                                                                                                                                                                              db                                                                                                                                                                                                                                              
�localhost                                                                                                                                                                           db                                                                                                                                                                                              db                                                                                                                                                                                                                                              

+�%                                                                                                                                                                                   db                                                                                                                                                                                              db                                                                                                                                                                                                                                              
�localhost                                                                                                                                                                           db                                                                                                                                                                                              db