Skip to content

Commit c806847

Browse files
dave-redferndave-redfern
committed
Update templates and default config files
1 parent 91e89f4 commit c806847

File tree

8 files changed

+68
-41
lines changed

8 files changed

+68
-41
lines changed

‎config/project_manager.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ somnambulist:
99
library: ~
1010

1111
service:
12+
accounts: 'git:git@github.com:somnambulist-tech/accounts-service-skeleton.git'
1213
data: 'git:git@github.com:somnambulist-tech/data-service-skeleton.git'
14+
events: 'git:git@github.com:somnambulist-tech/events-service-skeleton.git'
1315
logging: 'git:git@github.com:somnambulist-tech/logging-service-skeleton.git'
1416
api: 'git:git@github.com:somnambulist-tech/web-api-skeleton.git'
1517
app: 'git:git@github.com:somnambulist-tech/web-app-skeleton.git'
16-
web: 'composer:symfony/skeleton'
1718
symfony: 'composer:symfony/skeleton'
19+
laravel: 'composer:laravel/laravel'

‎config/templates/docker-compose.yml

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,39 @@ version: '3.5'
22

33
services:
44
example-app:
5-
image: php:7.3-fpm-alpine
5+
image: somnambulist/php-fpm:7.4-latest
6+
# requires config files to setup fpm and configure the build steps
7+
# build:
8+
# context: .
9+
# dockerfile: config/docker/dev/app/Dockerfile
610
networks:
7-
- example_network
11+
- mycompany_network_backend
12+
# expose a custom port for xdebug debugging <3.0
13+
# ports:
14+
# - 9005:9005
15+
16+
example-web:
17+
image: nginx:alpine
18+
# requires config files to link nginx to fpm
19+
# build:
20+
# context: .
21+
# dockerfile: config/docker/dev/web/Dockerfile
22+
depends_on:
23+
- example-app
24+
networks:
25+
- mycompany_network_backend
826
labels:
9-
traefik.port: 9000
10-
traefik.frontend.rule: "Host:app.example.dev"
27+
traefik.enable: true
28+
traefik.http.routers.example-web.rule: "Host(`service.example.dev`)"
29+
traefik.http.routers.example-web.tls: true
30+
traefik.http.services.example-web.loadbalancer.server.port: 8080
31+
# note: the container reference needs changing if you change the name above
1132

1233
example-redis:
1334
image: redis:alpine
1435
networks:
15-
- example_network
16-
labels:
17-
traefik.enable: "false"
36+
- mycompany_network_backend
1837

1938
networks:
20-
example_network:
39+
mycompany_network_backend:
2140
external: true
22-

‎config/templates/gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,3 +84,9 @@ Icon
8484
Network Trash Folder
8585
Temporary Items
8686
.apdisk
87+
88+
# PhpStorm 2020.2+ now stores hardcoded paths in the CLI tool config
89+
/.idea/commandlinetools/Symfony*.xml
90+
91+
# Symfony started adding a preload file
92+
src/.preload.php

‎config/templates/library-readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Requirements
44

5-
* PHP 7.2+
5+
* PHP 7.4+
66

77
## Installation
88

‎config/templates/mutagen_sync_it.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ mutagen:
6666
options:
6767
default-directory-mode: '0755'
6868
default-file-mode: '0644'
69-
sync-mode: two-way-safe
69+
sync-mode: one-way-replica
7070
ignore-vcs: ~
7171
symlink-mode: ignore
7272
ignore:
@@ -79,11 +79,11 @@ mutagen:
7979
target: "docker://{docker:name=${APP_SERVICE_APP}:name}/app/composer.json"
8080
use_common: false
8181
options:
82-
sync-mode: two-way-safe
82+
sync-mode: one-way-replica
8383

8484
composer_lock:
8585
source: "${PROJECT_DIR}/composer.lock"
8686
target: "docker://{docker:name=${APP_SERVICE_APP}:name}/app/composer.lock"
8787
use_common: false
8888
options:
89-
sync-mode: two-way-safe
89+
sync-mode: one-way-replica

‎config/templates/phpunit.xml

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,34 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
32
<!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
4-
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/8.2/phpunit.xsd"
6-
colors="true"
7-
bootstrap="vendor/autoload.php"
8-
>
3+
<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd"
4+
colors="true" bootstrap="vendor/autoload.php">
5+
<coverage processUncoveredFiles="true">
6+
<include>
7+
<directory suffix=".php">src/</directory>
8+
</include>
9+
<exclude>
10+
<directory>tests</directory>
11+
</exclude>
12+
</coverage>
913
<php>
10-
<ini name="error_reporting" value="-1" />
11-
<ini name="memory_limit" value="256M" />
12-
<server name="APP_ENV" value="test" force="true" />
13-
<server name="SHELL_VERBOSITY" value="-1" />
14-
<server name="SYMFONY_PHPUNIT_REMOVE" value="" />
15-
<server name="SYMFONY_PHPUNIT_VERSION" value="8" />
16-
<server name="SYMFONY_DEPRECATIONS_HELPER" value="disabled" />
14+
<ini name="error_reporting" value="-1"/>
15+
<ini name="memory_limit" value="256M"/>
16+
<server name="APP_ENV" value="test" force="true"/>
17+
<server name="SHELL_VERBOSITY" value="-1"/>
18+
<server name="SYMFONY_PHPUNIT_REMOVE" value=""/>
19+
<server name="SYMFONY_PHPUNIT_VERSION" value="9"/>
20+
<server name="SYMFONY_DEPRECATIONS_HELPER" value="disabled"/>
1721
</php>
18-
1922
<testsuites>
2023
<testsuite name="Project Test Suite">
2124
<directory>tests</directory>
2225
</testsuite>
2326
</testsuites>
24-
25-
<filter>
26-
<whitelist processUncoveredFilesFromWhitelist="true">
27-
<directory suffix=".php">src/</directory>
28-
<exclude>
29-
<directory>tests</directory>
30-
</exclude>
31-
</whitelist>
32-
</filter>
27+
<!-- <listeners>-->
28+
<!-- <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener"/>-->
29+
<!-- <listener class="DAMA\DoctrineTestBundle\PHPUnit\PHPUnitListener"/>-->
30+
<!-- </listeners>-->
31+
<!-- <extensions>-->
32+
<!-- <extension class="Somnambulist\Components\ReadModels\PHPUnit\PHPUnitListener"/>-->
33+
<!-- </extensions>-->
3334
</phpunit>

‎config/templates/ppm.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
"app-env": "dev",
77
"debug": 1,
88
"logging": 1,
9-
"bootstrap": "PHPPM\\Bootstraps\\Symfony4",
9+
"bootstrap": "PHPPM\\Bootstraps\\SomnambulistSymfony",
1010
"max-requests": 1000,
1111
"max-execution-time": 60,
1212
"populate-server-var": true,
1313
"socket-path": "var\/run\/ppm\/",
1414
"pidfile": "var\/run\/ppm\/ppm.pid",
15-
"cgi-path": "\/usr\/bin\/php-cgi"
15+
"cgi-path": "\/usr\/bin\/php-cgi",
16+
"static-directory": "public"
1617
}

‎config/templates/services-readme.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@ Sometimes the build process does not work correctly and the containers may need
122122
* `docker-compose down`
123123
* rm -rf vendor
124124
* rm -f bin/doctrine* bin/phpunit
125-
* `docker-clean images`
126-
* `docker-clean`
125+
* `docker system prune`
127126
* `docker-compose up -d --build --force-recreate`
128127

129128
## Test Suite

0 commit comments

Comments
 (0)