small improvements to docker setup

Author: cebe

Makefile

@@ -4,6 +4,8 @@ USER=$$(whoami)
 DOCKER=docker-compose exec --user=$(USER) backend-php
 # The PHP binary to use, you may add arguments to PHP here
 PHP=php
+# directories writeable by webserver
+WRITEABLE_DIRS=/app/runtime /app/logs /app/backend/web/assets
 
 
 # default target lists general usage information
@@ -43,9 +45,12 @@ bash: cli
 cli:
 	$(DOCKER) bash
 
-start-docker: config/components-dev.local.php config/components-test.local.php backend/config/cookie-validation.key env.php
+start-docker: config/components-dev.local.php config/components-test.local.php backend/config/cookie-validation.key env.php stop
 	docker-compose up -d
-	$(DOCKER) sh -c 'cd /app && composer install'
+	docker-compose exec -T backend-php bash -c "grep '^$(shell whoami):' /etc/passwd || useradd -m '$(shell whoami)' --uid=$(shell id -u) -G www-data -s /bin/bash"
+	docker-compose exec -T backend-php bash -c "sed -i 's/#force_color_prompt=yes/force_color_prompt=yes/' /home/$(shell whoami)/.bashrc && sed -i 's~etc/bash_completion~etc/bash_completion.d/yii~' /home/$(shell whoami)/.bashrc"
+	docker-compose exec -T backend-php bash -c "chgrp -R www-data $(WRITEABLE_DIRS) && chmod -R g+w $(WRITEABLE_DIRS)"
+	$(DOCKER) sh -c 'cd /app && composer install --no-progress --no-interaction --ansi'
 	@echo ""
 	@echo "API:      http://localhost:8337/"
 #	@echo "API docs: http://localhost:8337/docs/index.html" # not yet :)

api/Dockerfile

@@ -1,3 +1,3 @@
-FROM yiisoftware/yii2-php:7.3-apache
+FROM yiisoftware/yii2-php:7.4-apache
 
 COPY config/apache.conf /etc/apache2/sites-enabled/000-default.conf

backend/Dockerfile

@@ -1,3 +1,3 @@
-FROM yiisoftware/yii2-php:7.3-apache
+FROM yiisoftware/yii2-php:7.4-apache
 
 COPY config/apache.conf /etc/apache2/sites-enabled/000-default.conf

composer.json

@@ -22,6 +22,9 @@
         "platform": {"php": "7.1.3"},
         "fxp-asset": {
             "enabled": false
+        },
+        "allow-plugins": {
+            "yiisoft/yii2-composer": true
         }
     },
     "repositories": [