Merge dev into master

.devcontainer/devcontainer.json

@@ -1,7 +1,7 @@
 // See https://aka.ms/vscode-remote/devcontainer.json for format details.
 {
   "name": "Hashtopolis Devcontainer",
-  "dockerComposeFile": "docker-compose.yml",
+  "dockerComposeFile": "docker-compose.mysql.yml",
   "service": "hashtopolis-server-dev",
   "runServices": [
     "hashtopolis-db-dev"
@@ -13,6 +13,7 @@
         "xdebug.php-debug",
         "bmewburn.vscode-intelephense-client",
         "editorconfig.editorconfig",
+        "eamodio.gitlens",
         "github.vscode-pull-request-github",
         "ms-python.python",
         "ms-python.flake8",

.devcontainer/docker-compose.mysql.yml

@@ -0,0 +1,52 @@
+version: "3.7"
+services:
+  hashtopolis-server-dev:
+    container_name: hashtopolis-server-dev
+    build:
+      context: ..
+      target: hashtopolis-server-dev
+      args:
+        - CONTAINER_USER_CMD_PRE
+        - CONTAINER_USER_CMD_POST
+    environment:
+      HASHTOPOLIS_DB_TYPE: mysql
+      HASHTOPOLIS_DB_USER: hashtopolis
+      HASHTOPOLIS_DB_PASS: hashtopolis
+      HASHTOPOLIS_DB_HOST: hashtopolis-db-dev
+      HASHTOPOLIS_DB_DATABASE: hashtopolis
+      HASHTOPOLIS_APIV2_ENABLE: 1
+    depends_on:
+      - hashtopolis-db-dev
+    ports:
+      - "8080:80"
+    volumes:
+      # This is where VS Code should expect to find your project's source code
+      # and the value of "workspaceFolder" in .devcontainer/devcontainer.json
+      - ..:/var/www/html
+      - hashtopolis-server-dev:/usr/local/share/hashtopolis:Z
+      # - ./jwks.json:/keys/jwks.json:ro
+    networks:
+      - hashtopolis_dev
+  hashtopolis-db-dev:
+    container_name: hashtopolis-db-dev
+    image: mysql:8.4
+    restart: always
+    ports:
+      - "3306:3306"
+    volumes:
+      - hashtopolis-db-dev:/var/lib/mysql
+    environment:
+      MYSQL_ROOT_PASSWORD: hashtopolis
+      MYSQL_DATABASE: hashtopolis
+      MYSQL_USER: hashtopolis
+      MYSQL_PASSWORD: hashtopolis
+    networks:
+      - hashtopolis_dev
+volumes:
+  hashtopolis-db-dev:
+  hashtopolis-server-dev:
+
+networks:
+  hashtopolis_dev:
+    # This network will also be used by the python-agent
+    name: hashtopolis_dev

.devcontainer/docker-compose.postgres.yml

@@ -0,0 +1,52 @@
+version: "3.7"
+services:
+  hashtopolis-server-dev:
+    container_name: hashtopolis-server-dev
+    build:
+      context: ..
+      target: hashtopolis-server-dev
+      args:
+        - CONTAINER_USER_CMD_PRE
+        - CONTAINER_USER_CMD_POST
+    environment:
+      HASHTOPOLIS_DB_TYPE: postgres
+      HASHTOPOLIS_DB_USER: hashtopolis
+      HASHTOPOLIS_DB_PASS: hashtopolis
+      HASHTOPOLIS_DB_HOST: hashtopolis-db-dev
+      HASHTOPOLIS_DB_DATABASE: hashtopolis
+      HASHTOPOLIS_APIV2_ENABLE: 1
+    depends_on:
+      - hashtopolis-db-dev
+    ports:
+      - "8080:80"
+    volumes:
+      # This is where VS Code should expect to find your project's source code
+      # and the value of "workspaceFolder" in .devcontainer/devcontainer.json
+      - ..:/var/www/html
+      - hashtopolis-server-dev:/usr/local/share/hashtopolis:Z
+      # - ./jwks.json:/keys/jwks.json:ro
+    networks:
+      - hashtopolis_dev
+  hashtopolis-db-dev:
+    container_name: hashtopolis-db-dev
+    image: postgres:18
+    restart: always
+    ports:
+      - "5432:5432"
+    volumes:
+      - hashtopolis-db-dev:/var/lib/postgresql
+    environment:
+      POSTGRES_DB: hashtopolis
+      POSTGRES_USER: hashtopolis
+      POSTGRES_PASSWORD: hashtopolis
+    networks:
+      - hashtopolis_dev
+
+volumes:
+  hashtopolis-db-dev:
+  hashtopolis-server-dev:
+
+networks:
+  hashtopolis_dev:
+    # This network will also be used by the python-agent
+    name: hashtopolis_dev