Skip to content

Commit af10b59

Browse files
committed
Merge branch 'develop'
2 parents 2d244f9 + c36292a commit af10b59

261 files changed

Lines changed: 15315 additions & 10158 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.docker/data/.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Ignore everything in this directory
2+
*
3+
# Except this file
4+
!.gitignore
5+
!Readme.md

.docker/data/README.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# .docker/data
2+
3+
Please map persistent volumes to this directory on the servers.
4+
5+
If a container needs to persist data between restarts you can map the relevant files in the container to ``docker/data/<container-name>`.
6+
7+
## RabbitMQ example
8+
If you are using RabbitMQ running in a container as a message broker you need to configure a persistent volume for RabbitMQs data directory to avoid losing message on container restarts.
9+
10+
```yaml
11+
# docker-compose.server.override.yml
12+
13+
services:
14+
rabbit:
15+
image: rabbitmq:3.9-management-alpine
16+
hostname: "${COMPOSE_PROJECT_NAME}"
17+
networks:
18+
- app
19+
- frontend
20+
environment:
21+
- "RABBITMQ_DEFAULT_USER=${RABBITMQ_USER}"
22+
- "RABBITMQ_DEFAULT_PASS=${RABBITMQ_PASSWORD}"
23+
- "RABBITMQ_ERLANG_COOKIE=${RABBITMQ_ERLANG_COOKIE}"
24+
volumes:
25+
- ".docker/data/rabbitmq:/var/lib/rabbitmq/mnesia/"
26+
```

.docker/nginx.conf

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
worker_processes auto;
2+
3+
error_log /dev/stderr notice;
4+
pid /tmp/nginx.pid;
5+
6+
events {
7+
worker_connections 1024;
8+
}
9+
10+
http {
11+
proxy_temp_path /tmp/proxy_temp;
12+
client_body_temp_path /tmp/client_temp;
13+
fastcgi_temp_path /tmp/fastcgi_temp;
14+
uwsgi_temp_path /tmp/uwsgi_temp;
15+
scgi_temp_path /tmp/scgi_temp;
16+
17+
include /etc/nginx/mime.types;
18+
default_type application/octet-stream;
19+
20+
set_real_ip_from 172.16.0.0/16;
21+
real_ip_recursive on;
22+
real_ip_header X-Forwarded-For;
23+
24+
log_format main '$http_x_real_ip - $remote_user [$time_local] "$request" '
25+
'$status $body_bytes_sent "$http_referer" '
26+
'"$http_user_agent" "$http_x_forwarded_for"';
27+
28+
access_log /dev/stdout main;
29+
30+
sendfile on;
31+
keepalive_timeout 65;
32+
33+
gzip on;
34+
35+
include /etc/nginx/conf.d/*.conf;
36+
}
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
server {
2+
listen ${NGINX_PORT};
3+
server_name localhost;
4+
5+
root ${NGINX_WEB_ROOT};
6+
7+
client_max_body_size ${NGINX_MAX_BODY_SIZE};
8+
9+
# This also needs to be set in the single server tag and not only in http.
10+
set_real_ip_from 172.16.0.0/16;
11+
real_ip_recursive on;
12+
real_ip_header X-Forwarded-For;
13+
14+
location / {
15+
# try to serve file directly, fallback to index.php
16+
try_files $uri /index.php$is_args$args;
17+
}
18+
19+
# Protect files and directories from prying eyes.
20+
location ~* \.(engine|inc|install|make|module|profile|po|sh|.*sql|.tar|.gz|.bz2|theme|twig|tpl(\.php)?|xtmpl|yml)(~|\.sw[op]|\.bak|\.orig|\.save)?$|^(\.(?!well-known).*|Entries.*|Repository|Root|Tag|Template|composer\.(json|lock)|web\.config)$|^#.*#$|\.php(~|\.sw[op]|\.bak|\.orig|\.save)$ {
21+
deny all;
22+
return 404;
23+
}
24+
25+
location ~ ^/index\.php(/|$) {
26+
fastcgi_buffers 16 32k;
27+
fastcgi_buffer_size 64k;
28+
fastcgi_busy_buffers_size 64k;
29+
30+
fastcgi_pass ${NGINX_FPM_SERVICE};
31+
fastcgi_split_path_info ^(.+\.php)(/.*)$;
32+
include fastcgi_params;
33+
34+
fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
35+
fastcgi_param DOCUMENT_ROOT $realpath_root;
36+
37+
internal;
38+
}
39+
40+
location ~ \.php$ {
41+
return 404;
42+
}
43+
44+
# Send log message to files symlinked to stdout/stderr.
45+
error_log /dev/stderr;
46+
access_log /dev/stdout main;
47+
}

.docker/vhost.conf

Lines changed: 0 additions & 45 deletions
This file was deleted.

.editorconfig

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
# EditorConfig is awesome: https://editorconfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
# Unix-style newlines with a newline ending every file
7+
[*]
8+
end_of_line = lf
9+
insert_final_newline = true
10+
charset = utf-8
11+
indent_style = space
12+
indent_size = 4
13+
14+
[*.{css,js,twig}]
15+
indent_size = 2

.env.dist renamed to .env

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
# Copy this file to .env file for development, create environment variables when deploying to production
33
# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
44

5+
###> aakb/itkdev-docker configuration ###
6+
COMPOSE_PROJECT_NAME=itstyr
7+
COMPOSE_DOMAIN=itstyr.local.itkdev.dk
8+
ITKDEV_TEMPLATE=symfony-6
9+
###< aakb/itkdev-docker configuration ###
10+
511
###> symfony/framework-bundle ###
612
APP_ENV=dev
713
APP_SECRET=ef328b855abd10c26ed43a768edcb8e7
@@ -17,10 +23,14 @@ MAILER_URL=smtp://mailhog:1025
1723
###< symfony/swiftmailer-bundle ###
1824

1925
###> doctrine/doctrine-bundle ###
20-
# Format described at http://docs.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
21-
# For an SQLite database, use: "sqlite:///%kernel.project_dir%/var/data.db"
22-
# Configure your db driver and server_version in config/packages/doctrine.yaml
23-
DATABASE_URL=mysql://db:db@mariadb:3306/db
26+
# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
27+
# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
28+
#
29+
# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
30+
# DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8.0.32&charset=utf8mb4"
31+
# DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
32+
# DATABASE_URL=mysql://db:db@mariadb:3306/db
33+
DATABASE_URL="mysql://db:db@mariadb:3306/db?serverVersion=10.11.2-MariaDB&charset=utf8mb4"
2434
###< doctrine/doctrine-bundle ###
2535

2636
###> fos/fos-user-bundle ###

.env.test

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# define your env variables for the test env here
2+
KERNEL_CLASS='App\Kernel'
3+
APP_SECRET='$ecretf0rt3st'
4+
SYMFONY_DEPRECATIONS_HELPER=999999
5+
PANTHER_APP_ENV=panther
6+
PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#### Link to ticket
2+
3+
Please add a link to the ticket being addressed by this change.
4+
5+
#### Description
6+
7+
Please include a short description of the suggested change and the reasoning behind the approach you have chosen.
8+
9+
#### Screenshot of the result
10+
11+
If your change affects the user interface you should include a screenshot of the result with the pull request.
12+
13+
#### Checklist
14+
15+
- [ ] My code passes our static analysis suite.
16+
- [ ] My code passes our continuous integration process.
17+
18+
If your code does not pass all the requirements on the checklist you have to add a comment explaining why this change
19+
should be exempt from the list.
20+
21+
#### Additional comments or questions
22+
23+
If you have any further comments or questions for the reviewer please add them here.

.github/workflows/changelog.yaml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# Do not edit this file! Make a pull request on changing
2+
# github/workflows/changelog.yaml in
3+
# https://github.com/itk-dev/devops_itkdev-docker if need be.
4+
5+
### ### Changelog
6+
###
7+
### Checks that changelog has been updated
8+
9+
name: Changelog
10+
11+
on:
12+
pull_request:
13+
14+
jobs:
15+
changelog:
16+
runs-on: ubuntu-latest
17+
strategy:
18+
fail-fast: false
19+
steps:
20+
- name: Checkout
21+
uses: actions/checkout@v4
22+
with:
23+
fetch-depth: 2
24+
25+
- name: Git fetch
26+
run: git fetch
27+
28+
- name: Check that changelog has been updated.
29+
run: git diff --exit-code origin/${{ github.base_ref }} -- CHANGELOG.md && exit 1 || exit 0

0 commit comments

Comments
 (0)