improve docker stack

Author: cebe

Makefile

@@ -45,10 +45,10 @@ bash: cli
 cli:
 	$(DOCKER) bash
 
-start-docker: runtime/build-docker config/components-dev.local.php config/components-test.local.php backend/config/cookie-validation.key env.php stop
+start-docker: docker-compose.override.yml runtime/build-docker config/components-dev.local.php config/components-test.local.php backend/config/cookie-validation.key env.php stop
 	docker-compose up -d
-	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 "grep '^$(shell whoami):' /etc/passwd || useradd -m '$(shell whoami)' --uid=$(shell id -u) -G www-data -s /bin/bash -d /app/runtime/home"
+	docker-compose exec -T backend-php bash -c "sed -i 's/#force_color_prompt=yes/force_color_prompt=yes/' /app/runtime/home/.bashrc && sed -i 's~etc/bash_completion~etc/bash_completion.d/yii~' /app/runtime/home/.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 ""
@@ -70,5 +70,7 @@ config/components-%.local.php: config/components-ENV.local.php
 	test -f $@ || cp $< $@
 env.php: env.php.dist
 	test -f $@ || cp $< $@
+docker-compose.override.yml: docker-compose.override.dist.yml
+	test -f $@ || cp $< $@
 backend/config/cookie-validation.key:
 	test -s $@ || php -r 'echo bin2hex(random_bytes(20));' > $@

config/gii-generators.php

@@ -5,10 +5,12 @@
  */
 return [
     'api' => [
-            'class' => \cebe\yii2openapi\generator\ApiGenerator::class,
-            'urlConfigFile' => '@api/config/url-rules.rest.php',
-            'controllerNamespace' => 'api\\controllers',
-            'modelNamespace' => 'common\\models',
-            'migrationPath' => '@common/migrations',
+        'class' => \cebe\yii2openapi\generator\ApiGenerator::class,
+        'urlConfigFile' => '@api/config/url-rules.rest.php',
+        'controllerNamespace' => 'api\\controllers',
+        'modelNamespace' => 'common\\models',
+        'fakerNamespace' => 'common\\models\\faker',
+        'migrationPath' => '@common/migrations',
+
     ],
 ];

docker-compose.override.dist.yml

@@ -0,0 +1,26 @@
+# Development stack overrides
+#
+# Variables are populated with values from `.env`
+#
+version: '2'
+services:
+  api-php:
+    ports:
+      - '8337:80'
+
+  backend-php:
+    ports:
+      - '8338:80'
+    volumes:
+      # Re-use local composer cache via host-volume
+      - ~/.composer-docker/cache:/root/.composer/cache:delegated
+
+  db:
+    volumes:
+      - ./runtime/mariadb-data:/var/lib/mysql
+    ports:
+      - '3386:3306'
+
+  mailcatcher:
+    ports:
+      - '8055:1080'