CI: Update to latest stable MySQL, PostgreSQL

Signed-off-by: Stephen Finucane <stephen@that.guru>

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index da27ae2337e8e3a39994d6e88960f48bb6e869ae..4af0f7091759cef88fc9a5223d6d1a3b72e611d5 100644 (file)
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -47,7 +47,7 @@ jobs:
       MYSQL_ROOT_PASSWORD: root-${{ github.run_id }}
     services:
       postgres:
-        image: postgres:17
+        image: postgres:18
         env:
           POSTGRES_DB: ${{ env.DATABASE_NAME }}
           POSTGRES_PASSWORD: ${{ env.DATABASE_PASSWORD }}
@@ -60,7 +60,7 @@ jobs:
           --health-timeout 5s
           --health-retries 5
       mysql:
-        image: mysql:8.4
+        image: mysql:9.7
         env:
           MYSQL_DATABASE: ${{ env.DATABASE_NAME }}
           MYSQL_USER: ${{ env.DATABASE_USER }}
@@ -98,8 +98,10 @@ jobs:
       - name: Modify database user permissions (mysql)
         if: ${{ matrix.db == 'mysql' }}
         run: |
-          mysql -h 127.0.0.1 -e "GRANT ALL ON \`test\\_${DATABASE_NAME}%\`.* to '${DATABASE_USER}'@'%';" \
-              -uroot -p${MYSQL_ROOT_PASSWORD}
+          mysql -h 127.0.0.1 -uroot -p${MYSQL_ROOT_PASSWORD} -e \
+              "GRANT ALL ON \`test\\_${DATABASE_NAME}%\`.* TO '${DATABASE_USER}'@'%';
+               GRANT PROCESS, SESSION_VARIABLES_ADMIN ON *.* TO '${DATABASE_USER}'@'%';
+               FLUSH PRIVILEGES;"
       - name: Run unit tests (via tox)
         run: tox
   docs:
@@ -164,8 +166,11 @@ jobs:
       - name: Modify database user permissions (mysql)
         if: ${{ matrix.db == 'mysql' }}
         run: |
-          docker compose exec -T -- db \
-              sh -c "exec mysql -uroot -p\"\${MYSQL_ROOT_PASSWORD}\" -e \"GRANT ALL ON \\\`test\\_\${MYSQL_DATABASE}%\\\`.* to '\${MYSQL_USER}'@'%'; FLUSH PRIVILEGES;\""
+          docker compose exec -T -- db sh -c \
+              "exec mysql -uroot -p\"\${MYSQL_ROOT_PASSWORD}\" -e \
+              \"GRANT ALL ON \\\`test\\_\${MYSQL_DATABASE}%\\\`.* TO '\${MYSQL_USER}'@'%';
+               GRANT PROCESS, SESSION_VARIABLES_ADMIN ON *.* TO '\${MYSQL_USER}'@'%';
+               FLUSH PRIVILEGES;\""
       - name: Run unittest
         run: docker compose run -T --rm web tox
       - name: Test normal startup

diff --git a/docker-compose-pg.yml b/docker-compose-pg.yml
index 3e277e5cf7f4ca9ce3fbdfc1b4831b6774813a06..a88daf071dd760fd46b2eb336c719a445a843395 100644 (file)
--- a/docker-compose-pg.yml
+++ b/docker-compose-pg.yml
@@ -1,9 +1,9 @@
 ---
 services:
   db:
-    image: postgres:17
+    image: postgres:18
     volumes:
-      - ./tools/docker/db/postdata:/var/lib/postgresql/data
+      - ./tools/docker/db/postdata:/var/lib/postgresql
     environment:
       - POSTGRES_DB=patchwork
       - POSTGRES_USER=patchwork

diff --git a/docker-compose.yml b/docker-compose.yml
index 61c61865f8d8c826fd34de29337a4e910666a45c..878d3185bb89b9859a2d28cef4659376500e3d04 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 ---
 services:
   db:
-    image: mysql:latest
+    image: mysql:9.7
     volumes:
       - ./tools/docker/db/data:/var/lib/mysql
     environment: