Skip to content

Commit e613e2f

Browse files
turegjorupturegjorup
committed
Merge branch 'release/2.0.0'
2 parents 65a8372 + 12c7f02 commit e613e2f

File tree

384 files changed

+29638
-12108
lines changed

Some content is hidden

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

384 files changed

+29638
-12108
lines changed

‎.docker/nginx.conf

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
worker_processes auto;
22

3-
error_log /var/log/nginx/error.log notice;
3+
error_log /dev/stderr notice;
44
pid /tmp/nginx.pid;
55

66
events {
@@ -26,11 +26,9 @@ http {
2626
'$status $body_bytes_sent "$http_referer" '
2727
'"$http_user_agent" "$http_x_forwarded_for"';
2828

29-
access_log /var/log/nginx/access.log main;
29+
access_log /dev/stdout main;
3030

3131
sendfile on;
32-
#tcp_nopush on;
33-
3432
keepalive_timeout 65;
3533

3634
gzip on;

‎.docker/templates/default.conf.template

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
server {
2+
listen ${NGINX_PORT};
3+
server_name localhost;
4+
5+
root ${NGINX_WEB_ROOT};
6+
7+
location / {
8+
# try to serve file directly, fallback to index.php
9+
try_files $uri /index.php$is_args$args;
10+
}
11+
12+
# Protect files and directories from prying eyes.
13+
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)$ {
14+
deny all;
15+
return 404;
16+
}
17+
18+
location ~ ^/index\.php(/|$) {
19+
fastcgi_buffers 16 32k;
20+
fastcgi_buffer_size 64k;
21+
fastcgi_busy_buffers_size 64k;
22+
23+
fastcgi_pass ${NGINX_FPM_SERVICE};
24+
fastcgi_split_path_info ^(.+\.php)(/.*)$;
25+
include fastcgi_params;
26+
27+
fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
28+
fastcgi_param DOCUMENT_ROOT $realpath_root;
29+
30+
internal;
31+
}
32+
33+
location ~ \.php$ {
34+
return 404;
35+
}
36+
37+
# Send log message to files symlinked to stdout/stderr.
38+
error_log /dev/stderr;
39+
access_log /dev/stdout main;
40+
}

‎.editorconfig

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Drupal editor configuration normalization
2+
# @see http://editorconfig.org/
3+
4+
# This is the top-most .editorconfig file; do not search in parent directories.
5+
root = true
6+
7+
# All files.
8+
[*]
9+
end_of_line = LF
10+
indent_style = space
11+
indent_size = 4
12+
charset = utf-8
13+
trim_trailing_whitespace = true
14+
insert_final_newline = true
15+
16+
[*.{js,scss}]
17+
indent_size = 2
18+
19+
[docker-compose*.yml]
20+
indent_size = 2

‎.env

+22-8
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ TRUSTED_PROXIES=127.0.0.1,REMOTE_ADDR
2727
# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
2828
#
2929
# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data.db"
30-
DATABASE_URL="mysql://db:db@mariadb:3306/db?serverVersion=mariadb-10.5.13"
30+
DATABASE_URL="mysql://db:db@mariadb:3306/db?serverVersion=10.11.5-MariaDB"
3131
#DATABASE_URL="postgresql://db_user:[email protected]:5432/db_name?serverVersion=13&charset=utf8"
3232
###< doctrine/doctrine-bundle ###
3333

@@ -40,6 +40,7 @@ CORS_ALLOW_ORIGIN='^https?://(localhost|127\.0\.0\.1)(:[0-9]+)?$'
4040

4141
###> App ###
4242
APP_DEFAULT_DATE_FORMAT='Y-m-d\TH:i:s.v\Z'
43+
APP_ACTIVATION_CODE_EXPIRE_INTERNAL=P2D
4344
###< App ###
4445

4546
###> lexik/jwt-authentication-bundle ###
@@ -56,14 +57,27 @@ JWT_SCREEN_REFRESH_TOKEN_TTL=2592000 # 30 days
5657
###< gesdinet/jwt-refresh-token-bundle ###
5758

5859
###> itk-dev/openid-connect-bundle ###
59-
# "admin" open id connect configuration variables (values provided by the OIDC IdP)
60-
OIDC_METADATA_URL=ADMIN_APP_METADATA_URL
61-
OIDC_CLIENT_ID=ADMIN_APP_CLIENT_ID
62-
OIDC_CLIENT_SECRET=ADMIN_APP_CLIENT_SECRET
63-
OIDC_REDIRECT_URI=ADMIN_APP_REDIRECT_URI
64-
OIDC_LEEWAY=30
60+
# internal provider
61+
INTERNAL_OIDC_METADATA_URL=INTERNAL_OIDC_METADATA_URL
62+
INTERNAL_OIDC_CLIENT_ID=INTERNAL_OIDC_CLIENT_ID
63+
INTERNAL_OIDC_CLIENT_SECRET=INTERNAL_OIDC_CLIENT_SECRET
64+
INTERNAL_OIDC_REDIRECT_URI=INTERNAL_OIDC_REDIRECT_URI
65+
INTERNAL_OIDC_LEEWAY=30
66+
INTERNAL_OIDC_CLAIM_NAME=navn
67+
INTERNAL_OIDC_CLAIM_EMAIL=email
68+
INTERNAL_OIDC_CLAIM_GROUPS=groups
6569

66-
CLI_REDIRECT=APP_CLI_REDIRECT_URI
70+
# external provider
71+
EXTERNAL_OIDC_METADATA_URL=EXTERNAL_OIDC_METADATA_URL
72+
EXTERNAL_OIDC_CLIENT_ID=EXTERNAL_OIDC_CLIENT_ID
73+
EXTERNAL_OIDC_CLIENT_SECRET=EXTERNAL_OIDC_CLIENT_SECRET
74+
EXTERNAL_OIDC_REDIRECT_URI=EXTERNAL_OIDC_REDIRECT_URI
75+
EXTERNAL_OIDC_LEEWAY=30
76+
EXTERNAL_OIDC_HASH_SALT=
77+
EXTERNAL_OIDC_CLAIM_ID=signinname
78+
79+
# cli redirect url
80+
OIDC_CLI_REDIRECT=APP_CLI_REDIRECT_URI
6781
###< itk-dev/openid-connect-bundle ###
6882

6983
###> redis ###

‎.github/workflows/github_build_release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
APP_ENV: prod
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020

2121
- name: Composer install
2222
run: |

‎.github/workflows/itkdev_docker_build_develop.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@ jobs:
1515
COMPOSER_ALLOW_SUPERUSER: 1
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919

2020
- name: Login to DockerHub
21-
uses: docker/login-action@v2
21+
uses: docker/login-action@v3
2222
with:
2323
username: ${{ secrets.DOCKERHUB_USER }}
2424
password: ${{ secrets.DOCKERHUB_TOKEN }}
2525

2626
# Build api
2727
- name: Docker meta (API)
2828
id: meta-api
29-
uses: docker/metadata-action@v4
29+
uses: docker/metadata-action@v5
3030
with:
3131
images: itkdev/os2display-api-service
3232

3333
- name: Build and push (API)
34-
uses: docker/build-push-action@v4
34+
uses: docker/build-push-action@v5
3535
with:
3636
context: ./infrastructure/itkdev/display-api-service/
3737
file: ./infrastructure/itkdev/display-api-service/Dockerfile
@@ -44,12 +44,12 @@ jobs:
4444
# Build nginx (depends on api build)
4545
- name: Docker meta (Nginx)
4646
id: meta-nginx
47-
uses: docker/metadata-action@v4
47+
uses: docker/metadata-action@v5
4848
with:
4949
images: itkdev/os2display-api-service-nginx
5050

5151
- name: Build and push (Nginx)
52-
uses: docker/build-push-action@v4
52+
uses: docker/build-push-action@v5
5353
with:
5454
context: ./infrastructure/itkdev/nginx/
5555
file: ./infrastructure/itkdev/nginx/Dockerfile

‎.github/workflows/itkdev_docker_build_tag.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@ jobs:
1414
COMPOSER_ALLOW_SUPERUSER: 1
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818

1919
- name: Login to DockerHub
20-
uses: docker/login-action@v2
20+
uses: docker/login-action@v3
2121
with:
2222
username: ${{ secrets.DOCKERHUB_USER }}
2323
password: ${{ secrets.DOCKERHUB_TOKEN }}
2424

2525
# Build api
2626
- name: Docker meta (API)
2727
id: meta-api
28-
uses: docker/metadata-action@v4
28+
uses: docker/metadata-action@v5
2929
with:
3030
images: itkdev/os2display-api-service
3131

3232
- name: Build and push (API)
33-
uses: docker/build-push-action@v4
33+
uses: docker/build-push-action@v5
3434
with:
3535
context: ./infrastructure/itkdev/display-api-service/
3636
file: ./infrastructure/itkdev/display-api-service/Dockerfile
@@ -43,7 +43,7 @@ jobs:
4343
# Build nginx (depends on api build)
4444
- name: Docker meta (Nginx)
4545
id: meta-nginx
46-
uses: docker/metadata-action@v4
46+
uses: docker/metadata-action@v5
4747
with:
4848
images: itkdev/os2display-api-service-nginx
4949

@@ -52,7 +52,7 @@ jobs:
5252
run: echo ::set-output name=git_tag::$(echo $GITHUB_REF_NAME)
5353

5454
- name: Build and push (Nginx)
55-
uses: docker/build-push-action@v4
55+
uses: docker/build-push-action@v5
5656
with:
5757
context: ./infrastructure/itkdev/nginx/
5858
file: ./infrastructure/itkdev/nginx/Dockerfile

‎.github/workflows/os2display_docker_build_develop.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@ jobs:
1515
COMPOSER_ALLOW_SUPERUSER: 1
1616
steps:
1717
- name: Checkout
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919

2020
- name: Login to DockerHub
21-
uses: docker/login-action@v2
21+
uses: docker/login-action@v3
2222
with:
2323
username: ${{ secrets.DOCKERHUB_USER }}
2424
password: ${{ secrets.DOCKERHUB_TOKEN }}
2525

2626
# Build api
2727
- name: Docker meta (API)
2828
id: meta-api
29-
uses: docker/metadata-action@v4
29+
uses: docker/metadata-action@v5
3030
with:
3131
images: os2display/display-api-service
3232

3333
- name: Build and push (API)
34-
uses: docker/build-push-action@v4
34+
uses: docker/build-push-action@v5
3535
with:
3636
context: ./infrastructure/os2display/display-api-service/
3737
file: ./infrastructure/os2display/display-api-service/Dockerfile
@@ -44,12 +44,12 @@ jobs:
4444
# Build nginx (depends on api build)
4545
- name: Docker meta (Nginx)
4646
id: meta-nginx
47-
uses: docker/metadata-action@v4
47+
uses: docker/metadata-action@v5
4848
with:
4949
images: os2display/display-api-service-nginx
5050

5151
- name: Build and push (Nginx)
52-
uses: docker/build-push-action@v4
52+
uses: docker/build-push-action@v5
5353
with:
5454
context: ./infrastructure/os2display/nginx/
5555
file: ./infrastructure/os2display/nginx/Dockerfile

‎.github/workflows/os2display_docker_build_tag.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,23 @@ jobs:
1414
COMPOSER_ALLOW_SUPERUSER: 1
1515
steps:
1616
- name: Checkout
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818

1919
- name: Login to DockerHub
20-
uses: docker/login-action@v2
20+
uses: docker/login-action@v3
2121
with:
2222
username: ${{ secrets.DOCKERHUB_USER }}
2323
password: ${{ secrets.DOCKERHUB_TOKEN }}
2424

2525
# Build api
2626
- name: Docker meta (API)
2727
id: meta-api
28-
uses: docker/metadata-action@v4
28+
uses: docker/metadata-action@v5
2929
with:
3030
images: os2display/display-api-service
3131

3232
- name: Build and push (API)
33-
uses: docker/build-push-action@v4
33+
uses: docker/build-push-action@v5
3434
with:
3535
context: ./infrastructure/os2display/display-api-service/
3636
file: ./infrastructure/os2display/display-api-service/Dockerfile
@@ -43,7 +43,7 @@ jobs:
4343
# Build nginx (depends on api build)
4444
- name: Docker meta (Nginx)
4545
id: meta-nginx
46-
uses: docker/metadata-action@v4
46+
uses: docker/metadata-action@v5
4747
with:
4848
images: os2display/display-api-service-nginx
4949

@@ -52,7 +52,7 @@ jobs:
5252
run: echo ::set-output name=git_tag::$(echo $GITHUB_REF_NAME)
5353

5454
- name: Build and push (Nginx)
55-
uses: docker/build-push-action@v4
55+
uses: docker/build-push-action@v5
5656
with:
5757
context: ./infrastructure/os2display/nginx/
5858
file: ./infrastructure/os2display/nginx/Dockerfile

0 commit comments

Comments
 (0)