From adea75fef1bb46a2b7115e8b5671e22889d6f47c Mon Sep 17 00:00:00 2001 From: Nikos Roussos Date: Tue, 7 Apr 2015 17:25:39 +0300 Subject: [PATCH] Use MariaDB for docker --- Dockerfile | 3 ++- fig.yml | 9 +++++++-- requirements/docker.txt | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index e67b488..4b998a8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ FROM centos:7 RUN yum makecache RUN yum -y install epel-release -RUN yum -y install -y python python-pip python-devel git gcc libjpeg-turbo-devel libxml2-devel libxslt-devel postgresql-devel +RUN yum -y install -y python python-pip python-devel git gcc libjpeg-turbo-devel \ + libxml2-devel libxslt-devel mysql-devel mysql RUN yum -y clean all COPY ./requirements/ /tmp/requirements/ diff --git a/fig.yml b/fig.yml index 9b4bf41..64a8743 100644 --- a/fig.yml +++ b/fig.yml @@ -1,5 +1,10 @@ db: - image: postgres:9.3 + image: mariadb:5.5 + environment: + - MYSQL_DATABASE=network + - MYSQL_USER=network + - MYSQL_PASSWORD=network + - MYSQL_ROOT_PASSWORD=toor web: build: . ports: @@ -12,6 +17,6 @@ web: - DJANGO_SETTINGS_MODULE=network.settings.dev - DEFAULT_FROM_EMAIL=noreply@example.com - ALLOWED_HOSTS=* - - DATABASE_URL=postgres://postgres@db/postgres + - DATABASE_URL=mysql://network:network@db/network command: ./bin/run-fig.sh diff --git a/requirements/docker.txt b/requirements/docker.txt index 3082a7f..f391f80 100644 --- a/requirements/docker.txt +++ b/requirements/docker.txt @@ -1,4 +1,4 @@ # Local development dependencies go here -r dev.txt -psycopg2==2.5.4 +MySQL-python==1.2.5