Merge branch 'master' into minimum-mysql-version

lansuite · Jan 7, 2018 · e288e22 · e288e22
2 parents 125f31b + b51cbb9
commit e288e22
Show file tree

Hide file tree

Showing 10 changed files with 263 additions and 3,521 deletions.
diff --git a/README.md b/README.md
@@ -43,6 +43,8 @@ $ docker-compose up
 This will start a [Nginx webserver](https://nginx.org/) with a [php-fpm](https://secure.php.net/manual/en/install.fpm.php) configuration and a [MySQL database](https://www.mysql.com/) for you.
 After everything started you should be able to visit http://<Your-Docker-IP>:8080/ and see a running LanSuite-System.
 
+*Attention*: This docker setup is not suggested for production.
+
 ### Configuration file
 
 An example configuration file looks like:

diff --git a/composer.json b/composer.json
@@ -12,6 +12,7 @@
         }
     ],
     "require": {
-        "smarty/smarty": "^3.1"
+        "smarty/smarty": "^3.1",
+        "geshi/geshi": "^1.0.9"
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -19,9 +19,12 @@ services:
             - code-network
     mysql:
         image: mysql:5.6
+        ports:
+            - "3306:3306"
+
         environment:
             - MYSQL_ALLOW_EMPTY_PASSWORD=yes
-            - MYSQL_DATABASE="lansuite"
+            - MYSQL_DATABASE=lansuite
         networks:
             - code-network