Skip to content

Commit

Permalink
Change docker setup to MariaDB
Browse files Browse the repository at this point in the history
  • Loading branch information
CSammy committed Apr 15, 2018
1 parent b3eaa4f commit 7c4e64e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
17 changes: 9 additions & 8 deletions Dockerfile.diaspora
Original file line number Diff line number Diff line change
Expand Up @@ -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/*

Expand Down
6 changes: 4 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 7c4e64e

Please sign in to comment.