Init next

.gitignore

@@ -1,5 +1,7 @@
 # App
-files
+/files
+/docker-compose-dev.yml
+/docker-compose.yml
 
 # ViM
 *.swp

app/composer.json

@@ -12,9 +12,12 @@
         }
     ],
     "minimum-stability": "dev",
+    "repositories": [
+        { "type": "git", "url": "https://github.com/citronbleuv/sabre-dav" }
+    ],
     "require": {
         "php": ">=5.5.0",
         "nortic/brute-force-protection": "~v1.0.0",
-        "sabre/dav": "~3.2.2"
+        "sabre/dav": "dev-patch-1"
     }
 }

app/web/server.php

@@ -53,7 +53,7 @@
 // Keeweb
 $server->on('method:GET', function(RequestInterface $request, ResponseInterface $response) use ($rootPath) {
 
-    if ( ! $request->getPath()) {
+    if ( ! $request->getPath() && ! $request->getRawServerValue('QUERY_STRING')) {
         include $rootPath .'/keeweb.html';
         exit;
     }

docker/prod/prepare/init.sh

@@ -59,7 +59,6 @@ chown -R www-data:www-data /var/www
 echo "- Install vendors"
 
 if [[ $DEV_COMPOSER ]]; then
-    echo "fwef";
     gosu www-data composer update --prefer-source
 else
     gosu www-data composer update

install

@@ -1,4 +1,25 @@
 #!/bin/bash
-docker-compose stop 
-docker-compose rm 
-docker-compose --file=docker-compose.dev.yml up -d --build
+
+if [ ! -z "$1" ] && [ $1 == 'dev' ]; then
+
+    if [ ! -f docker-compose-dev.yml ]; then
+        echo 'You must copy and configure the file docker-compose-dev.yml.dist to docker-compose-dev.yml'
+        exit 1
+    fi
+
+    docker-compose --file=docker-compose-dev.yml stop 
+    docker-compose --file=docker-compose-dev.yml rm 
+    docker-compose --file=docker-compose-dev.yml up -d --build
+
+else
+
+    if [ ! -f docker-compose.yml ]; then
+        echo 'You must copy and configure the file docker-compose.yml.dist to docker-compose.yml'
+        exit 1
+    fi
+
+    docker-compose stop 
+    docker-compose rm 
+    docker-compose up -d --build
+fi
+