improve docker stack

Author: cebe

Makefile

@@ -45,7 +45,7 @@ bash: cli
 cli:
 	$(DOCKER) bash
 
-start-docker: config/components-dev.local.php config/components-test.local.php backend/config/cookie-validation.key env.php stop
+start-docker: 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"
@@ -60,6 +60,10 @@ start-docker: config/components-dev.local.php config/components-test.local.php b
 stop-docker:
 	docker-compose down
 
+runtime/build-docker: */Dockerfile
+	docker-compose build
+	touch $@
+
 # copy config files if they do not exist
 config/components-%.local.php: config/components-ENV.local.php
 	test -f $@ || cp $< $@

README.md

@@ -62,6 +62,11 @@ You can now continue with [generating code](#generate-code).
 ### Using Docker
 
 You need [Docker](https://docs.docker.com/install/) and [Docker Compose](https://docs.docker.com/compose/install/) installed.
+
+Create the repository:
+
+    composer create-project cebe/yii2-app-api my-api
+
 For the easiest way you need GNU make, then run:
 
     make start-docker

api/Dockerfile

@@ -1,3 +1,6 @@
 FROM yiisoftware/yii2-php:7.4-apache
 
+# install git and unzip for composer install dist/source
+RUN apt-get update && apt-get -y install git unzip && apt-get clean && rm -rf /var/lib/apt/lists/*
+
 COPY config/apache.conf /etc/apache2/sites-enabled/000-default.conf

backend/Dockerfile

@@ -1,3 +1,6 @@
 FROM yiisoftware/yii2-php:7.4-apache
 
+# install git and unzip for composer install dist/source
+RUN apt-get update && apt-get -y install git unzip && apt-get clean && rm -rf /var/lib/apt/lists/*
+
 COPY config/apache.conf /etc/apache2/sites-enabled/000-default.conf

composer.json

@@ -7,7 +7,7 @@
         "php": ">=7.1.0",
         "yiisoft/yii2": "~2.0.16",
         "cebe/php-openapi": "^1.1",
-        "cebe/yii2-openapi": "^2.0@alpha",
+        "cebe/yii2-openapi": "^2.0@beta",
         "yiisoft/yii2-gii": "^2.1"
     },
     "autoload": {

docker-compose.yml

@@ -11,6 +11,10 @@ services:
     volumes:
       # Mount source-code for development
       - ./:/app
+    depends_on:
+      - db
+      - redis
+      - mailcatcher
 
   backend-php:
     build: backend
@@ -21,19 +25,23 @@ services:
       - ~/.composer-docker/cache:/root/.composer/cache:delegated
       # Mount source-code for development
       - ./:/app
+    depends_on:
+      - db
+      - redis
+      - mailcatcher
 
   db:
-    image: mysql:5.7
+    image: mariadb:10.8
     environment:
-      #- MYSQL_ROOT_PASSWORD=verysecret
-      - MYSQL_DATABASE=api_db
-      - MYSQL_USER=api
-      - MYSQL_PASSWORD=apisecret
+      - MARIADB_ROOT_PASSWORD=verysecret
+      - MARIADB_DATABASE=api_db
+      - MARIADB_USER=api
+      - MARIADB_PASSWORD=apisecret
 
   redis:
     image: redis:3
 
   mailcatcher:
     image: nisenabe/mailcatcher
     ports:
-      - '80'
+      - '8055:1080'