From 9201456475ea534eb257e9cffeaf0d3be4e51ee0 Mon Sep 17 00:00:00 2001
From: Manuel Herrmann <0@0x17.de>
Date: Mon, 17 Oct 2016 01:57:16 +0200
Subject: [PATCH] mariadb conf file location changed, nginx container htdocs
path changed
---
docker-compose.yml | 56 ++++++++++++++++++++--------------------
docker/DockerfileMariaDB | 2 +-
2 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/docker-compose.yml b/docker-compose.yml
index 0d35a23..f859880 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,34 +1,34 @@
web:
- image: richarvey/nginx-php-fpm
- links:
- - db
- ports:
- - "8080:80"
- volumes:
- - ./registration-system:/usr/share/nginx/html
+ image: richarvey/nginx-php-fpm
+ links:
+ - db
+ ports:
+ - "8080:80"
+ volumes:
+ - ./registration-system:/var/www/html
pma:
- image: phpmyadmin/phpmyadmin
- links:
- - db
- environment:
- - PMA_HOST=db
- - PMA_PORT=3306
- - PMA_USER=fsfahrt
- - PMA_PASSWORD=9Lug*96q
- ports:
- - "8090:80"
+ image: phpmyadmin/phpmyadmin
+ links:
+ - db
+ environment:
+ - PMA_HOST=db
+ - PMA_PORT=3306
+ - PMA_USER=fsfahrt
+ - PMA_PASSWORD=9Lug*96q
+ ports:
+ - "8090:80"
db:
- build: docker
- dockerfile: DockerfileMariaDB
- environment:
- - MYSQL_DATABASE=fsfahrt
- - MYSQL_USER=fsfahrt
- - MYSQL_PASSWORD=9Lug*96q
- expose:
- - "3306"
- volumes:
- - ./mysql_data:/var/lib/mysql
- - ./registration-system/other/sqlDumps/init_20151004.sql:/dump.sql:ro
+ build: docker
+ dockerfile: DockerfileMariaDB
+ environment:
+ - MYSQL_DATABASE=fsfahrt
+ - MYSQL_USER=fsfahrt
+ - MYSQL_PASSWORD=9Lug*96q
+ expose:
+ - "3306"
+ volumes:
+ - ./mysql_data:/var/lib/mysql
+ - ./registration-system/other/sqlDumps/init_20151004.sql:/dump.sql:ro
diff --git a/docker/DockerfileMariaDB b/docker/DockerfileMariaDB
index e907773..37e350c 100644
--- a/docker/DockerfileMariaDB
+++ b/docker/DockerfileMariaDB
@@ -9,7 +9,7 @@ RUN apt-get update && \
rm -rf /var/lib/apt/lists/*
# Set bind address to 0.0.0.0 and enforce port
-RUN sed -i -r 's/bind-address.*$/bind-address = 0.0.0.0/' /etc/mysql/my.cnf
+RUN sed -i -r 's/bind-address.*$/bind-address = 0.0.0.0/' /etc/mysql/mariadb.conf.d/50-server.cnf
#RUN sed -i -r 's/port.*$/port = 3306'/ /etc/mysql/my.cnf
# Add bash scripts for creating a user and run server
--
GitLab