Page MenuHomePhabricator
Differential D4518

[keyserver] Introduce getDBType function to distinguish MySQL and MariaDB
ClosedPublic
Actions

Authored by ashoat on Jul 13 2022, 8:40 AM.
Tags
None
Referenced Files
F5075761: D4518.id.diff
Fri, Mar 28, 5:14 PM
Unknown Object (File)
Fri, Mar 21, 6:11 PM
Unknown Object (File)
Wed, Mar 19, 7:13 PM
Unknown Object (File)
Sun, Mar 16, 10:04 AM
Unknown Object (File)
Sat, Mar 15, 3:58 PM
Unknown Object (File)
Wed, Mar 12, 3:30 PM
Unknown Object (File)
Wed, Mar 12, 3:30 PM
Unknown Object (File)
Wed, Mar 12, 3:30 PM
View All Files
Subscribers
• abosh
• adrian

Details

Reviewers
atul
tomek
• jon
Commits
rCOMMe2cb36c1a0d9: [keyserver] Introduce getDBType function to distinguish MySQL and MariaDB
Summary

Depends on D4516

Test Plan

Tested in combination with next diffs

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
keyserver/
src/
database/
10 lines

Diff 14549

View Options

keyserver/src/database/db-config.js

Show All 14 Lines env_file:
- .env - .env
environment: environment:
- REDIS_URL=redis://cache - REDIS_URL=redis://cache
- COMM_LISTEN_ADDR=0.0.0.0 - COMM_LISTEN_ADDR=0.0.0.0
- COMM_DATABASE_HOST=${COMM_DATABASE_HOST:-database} - COMM_DATABASE_HOST=${COMM_DATABASE_HOST:-database}
- COMM_DATABASE_DATABASE - COMM_DATABASE_DATABASE
- COMM_DATABASE_USER - COMM_DATABASE_USER
- COMM_DATABASE_PASSWORD - COMM_DATABASE_PASSWORD
- COMM_DATABASE_TYPE=mariadb10.8
depends_on: depends_on:
- cache - cache
- database - database
database: database:
image: mysql:5.7.37-debian image: mariadb:10.8.3-jammy
restart: always restart: always
expose: expose:
- "3306" - "3306"
# There is no ARM-based Mac build on Docker Hub, so we force x64
# This is what we want in production anyways. ARM-based Mac devs will have
# it emulated
platform: linux/amd64
command: > command: >
--max-allowed-packet=64M --max-allowed-packet=64M
--local-infile=0 --local-infile=0
--sql-mode=STRICT_ALL_TABLES --sql-mode=STRICT_ALL_TABLES
--innodb-buffer-pool-size=1600M --innodb-buffer-pool-size=1600M
environment: environment:
- MYSQL_RANDOM_ROOT_PASSWORD=yes - MARIADB_RANDOM_ROOT_PASSWORD=yes
- MYSQL_DATABASE=$COMM_DATABASE_DATABASE - MARIADB_DATABASE=$COMM_DATABASE_DATABASE
- MYSQL_USER=$COMM_DATABASE_USER - MARIADB_USER=$COMM_DATABASE_USER
- MYSQL_PASSWORD=$COMM_DATABASE_PASSWORD - MARIADB_PASSWORD=$COMM_DATABASE_PASSWORD
volumes: volumes:
- mysqldata:/var/lib/mysql - mysqldata:/var/lib/mysql
cache: cache:
image: redis:6.2.6-bullseye image: redis:6.2.6-bullseye
restart: always restart: always
expose: expose:
- "6379" - "6379"
command: redis-server --loglevel warning command: redis-server --loglevel warning
volumes: volumes:
mysqldata: mysqldata: