From 2fe3ede4ead94d6872ac177e9e47f277ef179f26 Mon Sep 17 00:00:00 2001
From: ErickSkrauch <erickskrauch@yandex.ru>
Date: Fri, 15 Nov 2019 20:03:52 +0300
Subject: [PATCH] Replace basic mariadb image with the bitnami

---
 .env-dist      | 12 ++++++------
 .gitlab-ci.yml | 10 +++++-----
 Dockerfile     | 10 +++++++---
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/.env-dist b/.env-dist
index 9ef67e1..0b0949b 100644
--- a/.env-dist
+++ b/.env-dist
@@ -49,9 +49,9 @@ AUTHSERVER_HOST=authserver.ely.by
 # LETSENCRYPT_HOST=account.ely.by
 # LETSENCRYPT_EMAIL=erickskrauch@ely.by
 
-# MySQL
-MYSQL_ALLOW_EMPTY_PASSWORD=yes
-MYSQL_ROOT_PASSWORD=
-MYSQL_DATABASE=ely_accounts
-MYSQL_USER=ely_accounts_user
-MYSQL_PASSWORD=ely_accounts_password
+# MariaDB
+ALLOW_EMPTY_PASSWORD=yes
+MARIADB_ROOT_PASSWORD=
+MARIADB_DATABASE=ely_accounts
+MARIADB_USER=ely_accounts_user
+MARIADB_PASSWORD=ely_accounts_password
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b0d718..bc90d0c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,7 +74,7 @@ Codeception:
   services:
     - name: redis:4.0.10-alpine
       alias: redis
-    - name: mariadb:10.2.11
+    - name: bitnami/mariadb:10.3.20-debian-9-r4
       alias: db
   variables:
     # App config
@@ -85,10 +85,10 @@ Codeception:
     REDIS_HOST: "redis"
     REDIS_PORT: "6379"
     # MariaDB config
-    MYSQL_RANDOM_ROOT_PASSWORD: "true"
-    MYSQL_DATABASE: "ely_accounts_test"
-    MYSQL_USER: "ely_accounts_tester"
-    MYSQL_PASSWORD: "ely_accounts_tester_password"
+    MARIADB_RANDOM_ROOT_PASSWORD: "true"
+    MARIADB_DATABASE: "ely_accounts_test"
+    MARIADB_USER: "ely_accounts_tester"
+    MARIADB_PASSWORD: "ely_accounts_tester_password"
   before_script:
     # We don't count code coverage yet, so xdebug can be removed
     - sudo rm /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
diff --git a/Dockerfile b/Dockerfile
index 3dec577..c2bbf5b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -88,7 +88,9 @@ CMD ["nginx", "-g", "daemon off;"]
 
 # ================================================================================
 
-FROM mariadb:10.3.14-bionic AS db
+FROM bitnami/mariadb:10.3.20-debian-9-r4 AS db
+
+USER 0
 
 COPY ./docker/mariadb/config.cnf /etc/mysql/conf.d/
 
@@ -116,5 +118,7 @@ RUN set -ex \
  && rm -rf /mysql-sys \
  && apt-get purge -y --auto-remove $fetchDeps
 
-ENTRYPOINT ["docker-entrypoint.sh"]
-CMD ["mysqld"]
+USER 1001
+
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["/run.sh"]