From 7c4e64eed7c1db848cec7b899a1050e7374f20a5 Mon Sep 17 00:00:00 2001
From: Samuel Cooper <github@csammy.net>
Date: Sun, 15 Apr 2018 20:54:26 +0200
Subject: [PATCH] Change docker setup to MariaDB

---
 Dockerfile.diaspora | 17 +++++++++--------
 docker-compose.yml  |  6 ++++--
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Dockerfile.diaspora b/Dockerfile.diaspora
index a665e50..3161acd 100644
--- a/Dockerfile.diaspora
+++ b/Dockerfile.diaspora
@@ -4,18 +4,19 @@ RUN DEBIAN_FRONTEND=noninteractive \
     apt-get update \
     && apt-get install -y -qq \
         build-essential \
-        libssl-dev \
+        cmake \
+        curl \
+        ghostscript \
+        git \
+        imagemagick \
         libcurl4-openssl-dev \
         libidn11-dev \
-        libxml2-dev \
-        libxslt-dev \
-        imagemagick \
-        ghostscript \
-        curl \
         libmagickwand-dev \
-        git \
+        libmariadbclient-dev \
         libpq-dev \
-        cmake \
+        libssl-dev \
+        libxml2-dev \
+        libxslt-dev \
         nodejs \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/docker-compose.yml b/docker-compose.yml
index fa1db31..c020be4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -18,15 +18,17 @@ services:
       - "${DIASPORA_DOCKER_DB}"
 
   postgresql:
-    image: postgres:9.6
+    image: postgres:10.3
     ports:
       - 55432:5432
     volumes:
       - postgresql_data:/var/lib/postgresql
 
   mysql:
-    image: mysql:5.7
+    image: mariadb:10.2
     ports:
       - 53306:3306
     volumes:
       - mysql_data:/var/lib/mysql
+    environment:
+      MYSQL_ROOT_PASSWORD: mysql