Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

USH-1216: switch db engine to MariaDB 10.11 #4836

Merged
merged 1 commit into from
Mar 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/test-and-ship.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
- pull_request

env:
MYSQL_ROOT_PASSWORD: root
MARIADB_ROOT_PASSWORD: root

jobs:
test:
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
port=${DB_PORT}
database=mysql
user=root
password=${MYSQL_ROOT_PASSWORD}
password=${MARIADB_ROOT_PASSWORD}
EOF

mysql -e "SELECT version();" ;
Expand Down Expand Up @@ -92,12 +92,12 @@ jobs:

services:
mysql:
image: mysql:5.7
image: mariadb:10.11
env:
MYSQL_DATABASE: ushahidi
MYSQL_USER: ushahidi
MYSQL_PASSWORD: ushahidi
MYSQL_ROOT_PASSWORD: ${{ env.MYSQL_ROOT_PASSWORD }}
MARIADB_DATABASE: ushahidi
MARIADB_USER: ushahidi
MARIADB_PASSWORD: ushahidi
MARIADB_ROOT_PASSWORD: ${{ env.MARIADB_ROOT_PASSWORD }}
ports:
- 3306:3306
options: --health-cmd "mysqladmin ping -h localhost"
Expand Down
10 changes: 5 additions & 5 deletions codeship-services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ deploy:


mysql/base: &_mysql_base
image: mysql:5.7
image: mariadb:10.11
environment:
- MYSQL_DATABASE=ushahidi
- MYSQL_USER=ushahidi
- MYSQL_PASSWORD=ushahidi
- MYSQL_ROOT_PASSWORD=root
- MARIADB_DATABASE=ushahidi
- MARIADB_USER=ushahidi
- MARIADB_PASSWORD=ushahidi
- MARIADB_ROOT_PASSWORD=root
mysql-7.2:
<<: *_mysql_base
mysql-7.3:
Expand Down
13 changes: 7 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
version: "2"
services:
mysql:
platform: linux/amd64
image: mysql:5.7
image: mariadb:10.11
environment:
MYSQL_ROOT_PASSWORD: root
MYSQL_DATABASE: ushahidi
MYSQL_USER: ushahidi
MYSQL_PASSWORD: ushahidi
MARIADB_ROOT_PASSWORD: root
MARIADB_DATABASE: ushahidi
MARIADB_USER: ushahidi
MARIADB_PASSWORD: ushahidi
command:
- --character-set-server=utf8mb4
- --collation-server=utf8mb4_unicode_ci
# mysql 8.0
# - --default-authentication-plugin=mysql_native_password
ports:
- "33061:3306"
redis:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
* zip
* Composer for PHP package management \( [https://getcomposer.org](https://getcomposer.org) \)
* Nginx version 1.10.x **\(Note: you can technically use apache, but this instructions will provide specific steps for Nginx only\)**
* MySQL server 5.7.x
* MariaDB server 10.11
* Node.js v10.x or higher
* Redis v3.2
* Cron daemon
Expand Down
Loading