File tree Expand file tree Collapse file tree 3 files changed +38
-8
lines changed Expand file tree Collapse file tree 3 files changed +38
-8
lines changed Original file line number Diff line number Diff line change @@ -45,10 +45,10 @@ bash: cli
45
45
cli :
46
46
$(DOCKER ) bash
47
47
48
- start-docker : runtime/build-docker config/components-dev.local.php config/components-test.local.php backend/config/cookie-validation.key env.php stop
48
+ 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
49
49
docker-compose up -d
50
- 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"
51
- 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"
50
+ 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 "
51
+ 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"
52
52
docker-compose exec -T backend-php bash -c " chgrp -R www-data $( WRITEABLE_DIRS) && chmod -R g+w $( WRITEABLE_DIRS) "
53
53
$(DOCKER ) sh -c ' cd /app && composer install --no-progress --no-interaction --ansi'
54
54
@echo " "
@@ -70,5 +70,7 @@ config/components-%.local.php: config/components-ENV.local.php
70
70
test -f $@ || cp $< $@
71
71
env.php : env.php.dist
72
72
test -f $@ || cp $< $@
73
+ docker-compose.override.yml : docker-compose.override.dist.yml
74
+ test -f $@ || cp $< $@
73
75
backend/config/cookie-validation.key :
74
76
test -s $@ || php -r ' echo bin2hex(random_bytes(20));' > $@
Original file line number Diff line number Diff line change 5
5
*/
6
6
return [
7
7
'api ' => [
8
- 'class ' => \cebe \yii2openapi \generator \ApiGenerator::class,
9
- 'urlConfigFile ' => '@api/config/url-rules.rest.php ' ,
10
- 'controllerNamespace ' => 'api \\controllers ' ,
11
- 'modelNamespace ' => 'common \\models ' ,
12
- 'migrationPath ' => '@common/migrations ' ,
8
+ 'class ' => \cebe \yii2openapi \generator \ApiGenerator::class,
9
+ 'urlConfigFile ' => '@api/config/url-rules.rest.php ' ,
10
+ 'controllerNamespace ' => 'api \\controllers ' ,
11
+ 'modelNamespace ' => 'common \\models ' ,
12
+ 'fakerNamespace ' => 'common \\models \\faker ' ,
13
+ 'migrationPath ' => '@common/migrations ' ,
14
+
13
15
],
14
16
];
Original file line number Diff line number Diff line change
1
+ # Development stack overrides
2
+ #
3
+ # Variables are populated with values from `.env`
4
+ #
5
+ version : ' 2'
6
+ services :
7
+ api-php :
8
+ ports :
9
+ - ' 8337:80'
10
+
11
+ backend-php :
12
+ ports :
13
+ - ' 8338:80'
14
+ volumes :
15
+ # Re-use local composer cache via host-volume
16
+ - ~/.composer-docker/cache:/root/.composer/cache:delegated
17
+
18
+ db :
19
+ volumes :
20
+ - ./runtime/mariadb-data:/var/lib/mysql
21
+ ports :
22
+ - ' 3386:3306'
23
+
24
+ mailcatcher :
25
+ ports :
26
+ - ' 8055:1080'
You can’t perform that action at this time.
0 commit comments