Merge pull request #52 from TimRepke/docker-fixes

Clean and Fix Docker Magic

docker-compose.yml

 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
 

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