diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml index b30d7a75b63..2b2d977a5f8 100644 --- a/.devcontainer/docker-compose.yml +++ b/.devcontainer/docker-compose.yml @@ -24,7 +24,7 @@ services: - default command: sleep infinity mysql: - image: mysql:8 + image: mysql:8.4.10 volumes: - mysql-storage:/var/lib/mysql restart: always diff --git a/backend/test/e2e/remote/docker-compose.test.yml b/backend/test/e2e/remote/docker-compose.test.yml index 393cab00a3c..63827d73c26 100644 --- a/backend/test/e2e/remote/docker-compose.test.yml +++ b/backend/test/e2e/remote/docker-compose.test.yml @@ -19,7 +19,7 @@ version: "3" services: mysql-test: - image: mysql:8.0.26 + image: mysql:8.4.10 platform: linux/x86_64 volumes: - mysql-test-storage:/var/lib/mysql @@ -33,12 +33,12 @@ services: MYSQL_PASSWORD: merico postgres-test: - image: postgres:14.2-alpine + image: postgres:18.1-alpine restart: always ports: - "3308:5432" volumes: - - postgres-test-storage:/var/lib/postgresql/data + - postgres-test-storage:/var/lib/postgresql environment: POSTGRES_DB: lake POSTGRES_USER: merico diff --git a/devops/deployment/temporal/docker-compose-temporal.yml b/devops/deployment/temporal/docker-compose-temporal.yml index 7b7aa1dcaee..5cad40acfb6 100644 --- a/devops/deployment/temporal/docker-compose-temporal.yml +++ b/devops/deployment/temporal/docker-compose-temporal.yml @@ -16,7 +16,7 @@ version: "3" services: mysql: - image: mysql:8.0.26 + image: mysql:8.4.10 volumes: - mysql-storage:/var/lib/mysql restart: always diff --git a/docker-compose-dev-mysql.yml b/docker-compose-dev-mysql.yml index 11b9bab0b5f..e7ad6a72fae 100644 --- a/docker-compose-dev-mysql.yml +++ b/docker-compose-dev-mysql.yml @@ -18,7 +18,7 @@ name: devlake-mysql services: mysql: - image: mysql:8 + image: mysql:8.4.10 volumes: - mysql-storage:/var/lib/mysql restart: always diff --git a/docker-compose-dev-postgresql.yml b/docker-compose-dev-postgresql.yml index 36b0a34e6e7..5a73b00c4c2 100644 --- a/docker-compose-dev-postgresql.yml +++ b/docker-compose-dev-postgresql.yml @@ -16,8 +16,8 @@ name: devlake-postgresql services: - postgres: - image: postgres:17.2 + postgres: + image: postgres:18.1 volumes: - postgres-storage:/var/lib/postgresql restart: always diff --git a/docker-compose.datasources.yml b/docker-compose.datasources.yml index 98f9223246d..a6fcc0a7bee 100644 --- a/docker-compose.datasources.yml +++ b/docker-compose.datasources.yml @@ -20,7 +20,7 @@ version: "3" services: mysql-ds: - image: mysql:8 + image: mysql:8.4.10 volumes: - ./.docker/mysql-ds:/var/lib/mysql # init.sql only runs on bootstrap. If you want to manually add the extra databases, run the SQL statements in the init.sql as MySQL root user diff --git a/grafana/scripts/entrypoint.sh b/grafana/scripts/entrypoint.sh index f5a13fa4c03..6b0493d41e6 100644 --- a/grafana/scripts/entrypoint.sh +++ b/grafana/scripts/entrypoint.sh @@ -204,7 +204,7 @@ else }, "jsonData": { "sslmode": "${SSL_MODE}", - "postgresVersion": 1400, + "postgresVersion": 1800, "database": "${POSTGRES_DATABASE}" }, "access": "proxy",