Skip to content

Commit

Permalink
Replace MySQL 8.2 with 8.4 and remove 8.0.35 Docker containers and fo…
Browse files Browse the repository at this point in the history
…r tests on GitHub.
  • Loading branch information
tkhamez committed Jun 1, 2024
1 parent e628778 commit e430159
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 11 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,9 @@ jobs:
- php-version: '8.2'
db-image: mysql
db-version: '8.0.22'
- php-version: '8.2'
db-image: mysql
db-version: '8.0.35'
- php-version: '8.3'
db-image: mysql
db-version: '8.2.0'
db-version: '8.4.0'
fail-fast: false
services:
database:
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ dd mm yyyy
- **BC break**: Dropped PHP 8.0 support, minimum required version is now 8.1.0.
- **BC break**: Removed `/application-api.json` file which is outdated since version 1.4.0.
- Added PHP 8.3 compatibility (no changes were necessary, but it's tested now).
- Added MySQL 8.4 compatibility (no changes were necessary, but it's tested now).
- Updated dependencies.

## 2.4.0
Expand Down
2 changes: 1 addition & 1 deletion backend/.env.dist
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
NEUCORE_APP_ENV=dev

# Database connection (the migrations work only with mysql/mariadb), required
NEUCORE_DATABASE_URL=mysql://neucore:neucore@neucore_db/neucore?serverVersion=10.5.22-MariaDB-1:10.5.22+maria~ubu2004
NEUCORE_DATABASE_URL=mysql://neucore:neucore@neucore_db/neucore
NEUCORE_MYSQL_VERIFY_SERVER_CERT="0" # 1 or 0, if set to 1 set a ca file below
NEUCORE_MYSQL_SSL_CA="" # /path/to/ca.pem

Expand Down
2 changes: 1 addition & 1 deletion doc/Install.md
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ A Linux server (others may work, but were not tested).
To run the application:
* PHP >=8.1.0 - 8.3 (64bit version), see [backend/composer.json](../backend/composer.json) for necessary and
suggested extensions (APCu highly recommended).
* MariaDB or MySQL Server (tested with MariaDB 10.5, 10.11, 11.0 and MySQL 8.0.22, 8.0.35, 8.2.0,
* MariaDB or MySQL Server (tested with MariaDB 10.5, 10.11, 11.0 and MySQL 8.0.22, 8.4.0,
NO_BACKSLASH_ESCAPES should not be on). Unit tests can also be run with a SQLite in-memory database.
* An HTTP Server with support for PHP and URL rewriting.
* Set the document root to the `web` directory.
Expand Down
8 changes: 3 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,12 @@ services:
image: mariadb:10.11 # LTS
#image: mariadb:11.0
#image: mysql:8.0.22
#image: mysql:8.0.35
#image: mysql:8.2.0
#image: mysql:8.4.0 # LTS
#volumes: ["./.db/10.5:/var/lib/mysql"]
volumes: ["./.db/10.11:/var/lib/mysql"]
#volumes: ["./.db/11:/var/lib/mysql"]
#volumes: ["./.db/8.0.22:/var/lib/mysql"]
#volumes: ["./.db/8.0:/var/lib/mysql"]
#volumes: ["./.db/8.2:/var/lib/mysql"]
#volumes: ["./.db/8.4:/var/lib/mysql"]
environment:
MYSQL_ROOT_PASSWORD: neucore
MYSQL_USER: neucore
Expand All @@ -41,7 +39,7 @@ services:
volumes: [".:/app"]
environment:
BACKEND_HOST: http://localhost:8080
ports: [ "3000:8080" ]
ports: ["3000:8080"]
user: node
working_dir: /app/frontend
dns: [1.1.1.1]
Expand Down

0 comments on commit e430159

Please sign in to comment.