Merge remote-tracking branch 'origin/master'

diff --git a/.gitignore b/.gitignore
index 00bbc72b285adad155da5ee3c93801fd57b08521..b83b7504b04a55da98e89e56f803301cecdeef0c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 lib/config.local.php
 lib/tos.local.txt
 var-*
+*._*
+/vendor
\ No newline at end of file

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644 (file)
index 0000000..b2cf87e
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,39 @@
+# Select docker image from https://hub.docker.com/_/php/
+image: php:7.1
+
+# Select what we should cache
+cache:
+  paths:
+  - vendor/
+
+before_script:
+  # Install git, the docker php image doesn't have it installed by default
+  - apt-get update -yqq
+  - apt-get install git -yqq
+  - apt-get install zip -yqq
+  # Enable necessary php extensions
+  - docker-php-ext-enable curl && docker-php-ext-enable json && docker-php-ext-enable zip && docker-php-ext-enable mbstring && docker-php-ext-enable gd && docker-php-ext-enable pdo_mysql
+  # Install composer
+  - curl -sS https://getcomposer.org/installer | php
+  # Create composer.json file manually, since this is a project without any non-dev dependencies yet
+  - php composer.phar require --dev jakub-onderka/php-parallel-lint
+  # Install all project dependencies
+  - php composer.phar install
+
+# Run tests
+## Default test with PHP7.1
+test_app_php71:
+  script:
+  - ./vendor/bin/parallel-lint --exclude vendor .
+
+# Run same tests with PHP7.0
+test_app_php70:
+  image: php:7.0
+  script:
+  - ./vendor/bin/parallel-lint --exclude vendor .
+
+# Run same tests with PHP5.6
+test_app_php56:
+  image: php:5.6
+  script:
+  - ./vendor/bin/parallel-lint --exclude vendor .

diff --git a/dev.sh b/dev.sh
index 0511c09b0fbd9b6337407b11a09f8c0fa6c6e577..d749cf74b4775cf6b7392cbec021ba04ee97eaaa 100755 (executable)
--- a/dev.sh
+++ b/dev.sh
@@ -1,16 +1,5 @@
 #!/bin/bash
-set -e
-if [ "$(id -u)" -ne "1000" ]; then
-       echo "your user id is not 1000, shared folder won't have a good uid"
-       exit 1
-fi
+jroot=$(cd "$(dirname $0)" && pwd)
 docker -h &> /dev/null || (echo "You need docker installed" && exit 1)
-docker pull mojo4242/jirafeau-dev:apache2-php7
-name=jirafeau-dev-$(date +%Y%m%d%H%M%S)
-docker run --name $name -d -p 8000:80 -v $(pwd):/var/www/html mojo4242/jirafeau-dev:apache2-php7 /usr/sbin/apache2ctl -D FOREGROUND
-echo "You can now open http://127.0.0.1:8000/"
-echo "Press enter to destroy instance..."
-read
-docker stop -t 0 $name
-docker rm $name
-echo "Instance destroyed"
+docker pull tutum/apache-php
+docker run -v $jroot:/app  -t -i --rm -p 8080:80 tutum/apache-php