WIP: Release/3.0.0

.docker/nginx.conf

@@ -7,7 +7,6 @@ events {
     worker_connections  1024;
 }
 
-
 http {
     proxy_temp_path /tmp/proxy_temp;
     client_body_temp_path /tmp/client_temp;
@@ -18,7 +17,7 @@ http {
     include       /etc/nginx/mime.types;
     default_type  application/octet-stream;
 
-    set_real_ip_from 172.16.0.0/8;
+    set_real_ip_from 172.16.0.0/16;
     real_ip_recursive on;
     real_ip_header X-Forwarded-For;
 

.docker/templates/default.conf.template

@@ -4,6 +4,13 @@ server {
 
     root ${NGINX_WEB_ROOT};
 
+    client_max_body_size ${NGINX_MAX_BODY_SIZE};
+
+    # This also needs to be set in the single server tag and not only in http.
+    set_real_ip_from 172.16.0.0/16;
+    real_ip_recursive on;
+    real_ip_header X-Forwarded-For;
+
     location / {
         # try to serve file directly, fallback to index.php
         try_files $uri /index.php$is_args$args;
@@ -30,6 +37,17 @@ server {
         internal;
     }
 
+    location /vite {
+        proxy_set_header   X-Forwarded-For $remote_addr;
+        proxy_set_header   Host $http_host;
+        proxy_pass         http://node:3000;
+        proxy_http_version 1.1;
+
+        # Enable WebSocket support for HMR
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+    }
+
     location ~ \.php$ {
         return 404;
     }

.editorconfig

@@ -1,4 +1,4 @@
-# Drupal editor configuration normalization
+# Editor configuration normalization
 # @see http://editorconfig.org/
 
 # This is the top-most .editorconfig file; do not search in parent directories.
@@ -8,13 +8,13 @@ root = true
 [*]
 end_of_line = LF
 indent_style = space
-indent_size = 4
+indent_size = 2
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[*.{js,scss}]
-indent_size = 2
+[config/**.{yml,yaml}]
+indent_size = 4
 
-[docker-compose*.yml]
-indent_size = 2
+[*.php]
+indent_size = 4

.env

@@ -1,5 +1,6 @@
-COMPOSE_PROJECT_NAME=displayapiservice
-COMPOSE_DOMAIN=displayapiservice.local.itkdev.dk
+COMPOSE_PROJECT_NAME=display
+COMPOSE_DOMAIN=display.local.itkdev.dk
+ITKDEV_TEMPLATE=symfony-6
 
 # In all environments, the following files are loaded if they exist,
 # the latter taking precedence over the former:
@@ -108,3 +109,24 @@ EVENTDATABASE_API_V2_CACHE_EXPIRE_SECONDS=300
 
 TRACK_SCREEN_INFO=false
 TRACK_SCREEN_INFO_UPDATE_INTERVAL_SECONDS=300
+
+###> Admin configuration ###
+### Will be injected in the html of the admin page.
+ADMIN_REJSEPLANEN_APIKEY=
+ADMIN_SHOW_SCREEN_STATUS=false
+ADMIN_TOUCH_BUTTON_REGIONS=false
+ADMIN_LOGIN_METHODS="[]"
+ADMIN_ENHANCED_PREVIEW=false
+###< Admin configuration ###
+
+###> Client configuration ###
+### Will be injected in the html of the client page.
+CLIENT_LOGIN_CHECK_TIMEOUT=20000
+CLIENT_REFRESH_TOKEN_TIMEOUT=300000
+CLIENT_RELEASE_TIMESTAMP_INTERVAL_TIMEOUT=600000
+CLIENT_SCHEDULING_INTERVAL=60000
+CLIENT_PULL_STRATEGY_INTERVAL=90000
+CLIENT_COLOR_SCHEME='{"type":"library","lat":56.0,"lng":10.0}'
+CLIENT_DEBUG=false
+CLIENT_LOGGING='[]'
+###< Client configuration ###

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
-#### Link to ticket
+#### Link to issue
 
-Please add a link to the ticket being addressed by this change.
+Please add a link to the issue being addressed by this change.
 
 #### Description
 
@@ -17,7 +17,7 @@ If your change affects the user interface you should include a screenshot of the
 - [ ] My code passes our static analysis suite.
 - [ ] My code passes our continuous integration process.
 
-If your code does not pass all the requirements on the checklist you have to add a comment explaining why this change 
+If your code does not pass all the requirements on the checklist you have to add a comment explaining why this change
 should be exempt from the list.
 
 #### Additional comments or questions

.github/workflows/changelog.yaml

@@ -0,0 +1,29 @@
+# Do not edit this file! Make a pull request on changing
+# github/workflows/changelog.yaml in
+# https://github.com/itk-dev/devops_itkdev-docker if need be.
+
+### ### Changelog
+###
+### Checks that changelog has been updated
+
+name: Changelog
+
+on:
+  pull_request:
+
+jobs:
+  changelog:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 2
+
+      - name: Git fetch
+        run: git fetch
+
+      - name: Check that changelog has been updated.
+        run: git diff --exit-code origin/${{ github.base_ref }} -- CHANGELOG.md && exit 1 || exit 0

.github/workflows/composer.yaml

@@ -0,0 +1,69 @@
+# Do not edit this file! Make a pull request on changing
+# github/workflows/composer.yaml in
+# https://github.com/itk-dev/devops_itkdev-docker if need be.
+
+### ### Composer
+###
+### Validates composer.json and checks that it's normalized.
+###
+### #### Assumptions
+###
+### 1. A docker compose service named `phpfpm` can be run and `composer` can be
+###    run inside the `phpfpm` service.
+### 2. [ergebnis/composer-normalize](https://github.com/ergebnis/composer-normalize)
+###    is a dev requirement in `composer.json`:
+###
+###    ``` shell
+###    docker compose run --rm phpfpm composer require --dev ergebnis/composer-normalize
+###    ```
+###
+###    Normalize `composer.json` by running
+###
+###    ``` shell
+###    docker compose run --rm phpfpm composer normalize
+###    ```
+
+name: Composer
+
+env:
+  COMPOSE_USER: root
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+      - develop
+
+jobs:
+  composer-validate:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v4
+      - run: |
+          docker network create frontend
+          docker compose run --rm phpfpm composer validate --strict
+
+  composer-normalized:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v4
+      - run: |
+          docker network create frontend
+          docker compose run --rm phpfpm composer install
+          docker compose run --rm phpfpm composer normalize --dry-run
+
+  composer-audit:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v4
+      - run: |
+          docker network create frontend
+          docker compose run --rm phpfpm composer install
+          docker compose run --rm phpfpm composer audit

.github/workflows/github_build_release.yml

@@ -1,7 +1,7 @@
 on:
   push:
     tags:
-      - '*.*.*'
+      - "*.*.*"
 
 name: Create Github Release
 

.github/workflows/itkdev_docker_build_develop.yml

@@ -2,7 +2,7 @@
 on:
   push:
     branches:
-      - 'develop'
+      - "develop"
 
 # This Action builds to itkdev/* using ./infrastructure/itkdev/*
 name: ITK Dev - Build docker image (develop)

.github/workflows/itkdev_docker_build_tag.yml

@@ -2,7 +2,7 @@
 on:
   push:
     tags:
-      - '*'
+      - "*"
 
 # This Action builds to itkdev/* using ./infrastructure/itkdev/*
 name: ITK Dev - Build docker image (tag)

.github/workflows/javascript.yaml

@@ -0,0 +1,36 @@
+# Do not edit this file! Make a pull request on changing
+# github/workflows/symfony/javascript.yaml in
+# https://github.com/itk-dev/devops_itkdev-docker if need be.
+
+### ### Symfony JavaScript (and TypeScript)
+###
+### Validates JavaScript files.
+###
+### #### Assumptions
+###
+### 1. A docker compose service named `prettier` for running
+###    [Prettier](https://prettier.io/) exists.
+
+name: JavaScript
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+      - develop
+
+jobs:
+  javascript-lint:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - run: |
+          docker network create frontend
+
+      - run: |
+          docker compose run --rm prettier 'assets/**/*.js' --check

.github/workflows/markdown.yaml

@@ -0,0 +1,43 @@
+# Do not edit this file! Make a pull request on changing
+# github/workflows/markdown.yaml in
+# https://github.com/itk-dev/devops_itkdev-docker if need be.
+
+### ### Markdown
+###
+### Lints Markdown files (`**/*.md`) in the project.
+###
+### [markdownlint-cli configuration
+### files](https://github.com/igorshubovych/markdownlint-cli?tab=readme-ov-file#configuration),
+### `.markdownlint.jsonc` and `.markdownlintignore`, control what is actually
+### linted and how.
+###
+### #### Assumptions
+###
+### 1. A docker compose service named `markdownlint` for running `markdownlint`
+###    (from
+###    [markdownlint-cli](https://github.com/igorshubovych/markdownlint-cli))
+###    exists.
+
+name: Markdown
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+      - develop
+
+jobs:
+  markdown-lint:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - run: |
+          docker network create frontend
+
+      - run: |
+          docker compose run --rm markdownlint markdownlint '**/*.md'

.github/workflows/os2display_docker_build_develop.yml

@@ -2,7 +2,7 @@
 on:
   push:
     branches:
-      - 'develop'
+      - "develop"
 
 # This Action builds to os2display/* using ./infrastructure/os2display/*
 name: OS2display - Build docker image (develop)

.github/workflows/os2display_docker_build_tag.yml

@@ -2,7 +2,7 @@
 on:
   push:
     tags:
-      - '*'
+      - "*"
 
 # This Action builds to os2display/* using ./infrastructure/os2display/*
 name: OS2display - Build docker image (tag)