Rearrange Docker config

Signed-off-by: Christoph Wurst <[email protected]>

Author: ChristophWurst

Diff for: .scrutinizer.yml

@@ -16,6 +16,6 @@ imports:
 
 tools:
     external_code_coverage:
-        runs: 2
-        timeout: 1800
+        runs: 1
+        timeout: 150
 

Diff for: .travis.yml

@@ -2,8 +2,7 @@ sudo: required
 dist: trusty
 language: php
 php:
-    - 7
-    - 7.1
+    - 7.2
 
 addons:
     mariadb: "10.0"
@@ -20,14 +19,8 @@ env:
 
 matrix:
     include:
-    - php: 7
-      env: WS_TEST=lint_php
-    - php: 7.1
-      env: WS_TEST=lint_php
-    - php: 7.1
-      env: WS_TEST=js
-    - php: 7.1
-      env: WS_TEST=docker
+    - env: WS_TEST=lint_php
+    - env: WS_TEST=js
     fast_finish: true
 
 branches:
@@ -43,7 +36,9 @@ before_script:
     - npm install -g yarn
 
     # Install dependencies
-    - make install-deps
+    - if [[ "$WS_TEST" = "js" ]]; then npm install; fi
+    - if [[ "$WS_TEST" = "js" ]]; then ./node_modules/bower/bin/bower install; fi
+    - if [[ "$WS_TEST" = "php" ]]; then composer install; fi
 
     # Set up DB
     - mysql -u root -e 'create database weinstein_test;'
@@ -68,9 +63,5 @@ script:
     - if [[ "$WS_TEST" = "js" ]]; then ./node_modules/grunt-cli/bin/grunt; fi
     - if [[ "$WS_TEST" = "js" ]]; then ./node_modules/grunt-cli/bin/grunt karma:continuous; fi
 
-    # Docker
-    - if [[ "$WS_TEST" = "docker" ]]; then ./node_modules/grunt-cli/bin/grunt; fi
-    - if [[ "$WS_TEST" = "docker" ]]; then ./build/docker-images.sh; fi
-
 after_script:
     - if [[ "$WS_TEST" = "php" ]]; then cat storage/logs/laravel.log; fi

Diff for: Dockerfile

@@ -0,0 +1,24 @@
+FROM node:9.5.0 as js-builder
+WORKDIR /app
+COPY package*.json /app/
+RUN npm install
+COPY . .
+RUN ./node_modules/bower/bin/bower install --allow-root
+RUN ./node_modules/grunt-cli/bin/grunt
+
+FROM composer:latest as php-builder
+COPY . /app
+RUN composer install --ignore-platform-reqs --no-dev -o
+
+FROM weinstein/webserver:latest
+COPY . /var/www
+COPY --from=js-builder /app/public/css/*.css /var/www/public/css/
+COPY --from=js-builder /app/public/js /var/www/public/js
+COPY --from=php-builder /app/vendor /var/www/vendor
+USER root
+RUN chown -R www-data /var/www && \
+    chgrp -R 0 /var/www && \
+    chmod -R g+rw /var/www/storage && \
+    chmod -R u+rw /var/www/storage
+USER www-data
+WORKDIR /var/www

Diff for: Makefile

@@ -3,15 +3,3 @@ all: build
 build:
 	./node_modules/grunt-cli/bin/grunt uglify
 
-install-deps:
-	yarn install
-	./node_modules/bower/bin/bower install
-	composer install
-
-test:
-	./vendor/phpunit/phpunit/phpunit -c tests/phpunit.xml
-
-clean:
-	rm -rf node_modules
-	rm -rf public/js/vendor
-	rm -rf vendor

Diff for: bower.json

@@ -1,5 +1,5 @@
 {
-  "name": "Weinstein",
+  "name": "weinstein",
   "description": "",
   "main": "",
   "authors": [