From f2619aeb2c0349bec8a45dccbd7fd65a1ec4bb51 Mon Sep 17 00:00:00 2001
From: Marcel Schwarz <marcel@icaotix.de>
Date: Sat, 14 Mar 2020 19:14:26 +0100
Subject: [PATCH] Add docker compose, add db setup, add webserver dockerfile

---
 .gitignore                      |  2 --
 Dockerfile                      |  5 +++++
 ~dbConnect.php => dbConnect.php | 12 ++++++------
 docker-compose.yml              | 29 +++++++++++++++++++++++++++++
 sql/Dockerfile                  |  2 +-
 sql/run-container.sh            |  1 -
 6 files changed, 41 insertions(+), 10 deletions(-)
 create mode 100644 Dockerfile
 rename ~dbConnect.php => dbConnect.php (77%)
 create mode 100644 docker-compose.yml
 delete mode 100644 sql/run-container.sh

diff --git a/.gitignore b/.gitignore
index c7f7bd3..e69de29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +0,0 @@
-
-dbConnect.php
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..f95b823
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,5 @@
+FROM php:7.0-apache
+
+RUN apt-get update
+RUN docker-php-ext-install pdo pdo_mysql mysqli
+RUN a2enmod rewrite
diff --git a/~dbConnect.php b/dbConnect.php
similarity index 77%
rename from ~dbConnect.php
rename to dbConnect.php
index 888225d..be2e0a1 100644
--- a/~dbConnect.php
+++ b/dbConnect.php
@@ -1,12 +1,12 @@
-<?php 
+<?php
 
 //Create DB connection.
 //This creates a usable "database" - Variable as mysqli Objekt
 //simply remove the "~" in front of the filename
-$user = 'user';
-$password = 'password';
-$db = 'database name';
-$host = 'ip or domain';
+$user = 'root';
+$password = 'Test';
+$db = 'kd42696_ipr-projekt';
+$host = 'db';
 $port = 3306;
 
 $database = new mysqli($host, $user, $password, $db, $port);
@@ -15,4 +15,4 @@ if ($database->connect_error) {
   die('Connect Error (' . $database->connect_errno . ') ' . $database->connect_error);
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..8222ba9
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,29 @@
+version: '3'
+
+services:
+  db:
+    build:
+      context: ./sql
+    ports:
+      - "5455:3306"
+    volumes:
+      - "db-data:/var/lib/mysql"
+    environment:
+      MYSQL_ROOT_PASSWORD: "Test"
+
+  webserver:
+    build:
+      context: .
+    ports:
+      - "80:80"
+    volumes:
+      - "./:/var/www/html"
+    depends_on:
+      - db
+
+volumes:
+  db-data:
+
+
+# docker run -d -p 5455:3306 -v `pwd`/setup:/docker-entrypoint-initdb.d/ -v `pwd`/mysql-data:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=Test mariadb
+# docker run -d -p 80:80 --name my-apache-php-app -v `pwd`:/var/www/html php:7.0-apache
diff --git a/sql/Dockerfile b/sql/Dockerfile
index a6f0619..4602ce3 100644
--- a/sql/Dockerfile
+++ b/sql/Dockerfile
@@ -1,2 +1,2 @@
 FROM mariadb
-COPY ./sql-dump.sql /docker-entrypoint-initdb.d/
+COPY ./sample-db.sql /docker-entrypoint-initdb.d/
diff --git a/sql/run-container.sh b/sql/run-container.sh
deleted file mode 100644
index d61be82..0000000
--- a/sql/run-container.sh
+++ /dev/null
@@ -1 +0,0 @@
-docker run -d -p 5455:3306 -v `pwd`/setup:/docker-entrypoint-initdb.d/ -v `pwd`/mysql-data:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=Test mariadb