From 909525d6303382b49fac280a07c5b5b8c4c72158 Mon Sep 17 00:00:00 2001
From: ivan <ivan@opensupports.com>
Date: Wed, 11 Apr 2018 22:10:28 -0300
Subject: [PATCH] Fix docker issues

---
 README.md         | 3 ++-
 server/Dockerfile | 1 +
 server/Makefile   | 2 +-
 tests/Makefile    | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index bef96ee3..c1097bd7 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,8 @@ Just as there is a `gulp dev` task for development, there is also a `gulp prod`
 - `make test` run phpunit tests
 
 Server api runs on `http://localhost:8080/`
-Also, there's a php server running on `http://localhost:6060/`
+Also, there's a *phpmyadmin* instance running on `http://localhost:6060/`,
+you can access with the username `root` and empty password
 
 ##### BACKEND API RUBY TESTING
 
diff --git a/server/Dockerfile b/server/Dockerfile
index 11df18bc..90b5580b 100644
--- a/server/Dockerfile
+++ b/server/Dockerfile
@@ -9,3 +9,4 @@ RUN apt-get update && \
 
 RUN echo 'LISTEN 8080' >> /etc/apache2/apache2.conf
 RUN sed -i "1s/.*/<VirtualHost *:8080>/" /etc/apache2/sites-enabled/000-default.conf
+RUN sed -i "5s/.*/Listen 8080/" /etc/apache2/ports.conf
diff --git a/server/Makefile b/server/Makefile
index 052200d5..050507f7 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -16,7 +16,7 @@ run:
 	@docker run -d --name opensupports-db -p 4040:3306 -e MYSQL_ALLOW_EMPTY_PASSWORD=yes -v $(PWD)/.dbdata/:/var/lib/mysql mysql
 	@docker run -d --name opensupports-myadmin --link opensupports-db:db -p 6060:80 phpmyadmin/phpmyadmin
 	@docker run -d --name opensupports-fakesmtp -p 7070:25 -v ${PWD}/.fakemail/:/var/mail munkyboy/fakesmtp
-	@docker run -d --name opensupports-srv --net="host" --rm -e LOG_STDOUT=true -e LOG_STDERR=true -e LOG_LEVEL=debug -v ${PWD}:/var/www/html opensupports-srv
+	@docker run -d --name opensupports-srv --net=host --rm -e LOG_STDOUT=true -e LOG_STDERR=true -e LOG_LEVEL=debug -v ${PWD}:/var/www/html opensupports-srv
 
 test:
 	@./run-tests.sh
diff --git a/tests/Makefile b/tests/Makefile
index 8b08ffa9..0bee6e8c 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -2,7 +2,7 @@ DB_HOST ?= `docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}
 
 install:
 	@apt-get install ruby-full
-	@apt-get install libmysqlclient-dev libmysqlclient16 ruby-dev
+	@apt-get install libmysqlclient-dev ruby-dev
 	@gem install bundler
 	@bundle install