updated github actions to run both systems

Author: s3inlc

.devcontainer/docker-compose.yml renamed to .devcontainer/docker-compose.mysql.yml

@@ -9,6 +9,7 @@ services:
         - 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

.devcontainer/docker-compose.postgres.yml

@@ -0,0 +1,51 @@
+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
+    networks:
+      - hashtopolis_dev
+  hashtopolis-db-dev:
+    container_name: hashtopolis-db-dev
+    image: mysql:8.0
+    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

.github/actions/start-hashtopolis/action.yml

@@ -1,12 +1,18 @@
 name: Start Hashtopolis server
 description: Starts application containers and waits for Hashtopolis to be ready.
 
+inputs:
+  db_system:
+    description: "Used to set which DB system should be used"
+    required: true
+    default: "mysql"
+
 runs:
   using: "composite"
   steps:
     - name: Start application containers
       working-directory: .devcontainer
-      run: docker compose up -d
+      run: docker compose up -f docker-compose.${{ env.INPUT_DB_SYSTEM }}.yml
       shell: bash
     - name: Install composer dependencies packages
       run: docker exec hashtopolis-server-dev composer install --working-dir=/var/www/html/

.github/workflows/ci.yml

@@ -13,11 +13,18 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - db_system: mysql
+          - db_system: postgres
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
       - name: Start Hashtopolis server
         uses: ./.github/actions/start-hashtopolis
+        with:
+          db_system: ${{ matrix.db_system }}
       - name: Give Apache permissions on necessary directories # for the tests, only src/files and src/inc/utils/locks seem necessary
         run: docker exec -u root hashtopolis-server-dev bash -c "chown -R www-data:www-data /var/www/html/src && chmod -R g+w /var/www/html/src"
       - name: Run test suite

.github/workflows/docs-build.yml

@@ -29,6 +29,8 @@ jobs:
         sudo apt-get install npm
     - name: Start Hashtopolis server
       uses: ./.github/actions/start-hashtopolis
+      with:
+        db_system: "mysql"
     - name: Download newest apiv2 spec
       run: |
         wget http://localhost:8080/api/v2/openapi.json -P /tmp/

.github/workflows/docs.yml

@@ -26,9 +26,11 @@ jobs:
         sudo apt-get install php
         sudo apt-get install -y lftp
         sudo apt-get install nodejs
-        sudo apt-get install npm 
+        sudo apt-get install npm
     - name: Start Hashtopolis server
       uses: ./.github/actions/start-hashtopolis
+      with:
+        db_system: "mysql"
     - name: Download newest apiv2 spec
       run: |
         wget http://localhost:8080/api/v2/openapi.json -P /tmp/