Skip to content
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
5 changes: 2 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
services:
bhima:
build: .
#image: ghcr.io/third-culture-software/bhima
image: thirdculturesoftware/bhima
restart: unless-stopped
ports:
Expand All @@ -19,11 +18,11 @@ services:
- backend

mysql:
image: mysql:8.3 # pin 8.3 ; https://github.com/appsignal/appsignal-nodejs/commit/0586d603c75aa12f8e99f4a5716fd8445f10d79c
image: mysql:8.4
restart: unless-stopped
command:
- --sql-mode=STRICT_ALL_TABLES,NO_UNSIGNED_SUBTRACTION
- --default-authentication-plugin=mysql_native_password
- --mysql-native-password=ON
volumes:
- mysqldata:/var/lib/mysql/
- ./server/models:/docker-entrypoint-initdb.d
Expand Down
8 changes: 5 additions & 3 deletions docs/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -225,14 +225,14 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.3.6)
mini_portile2 (2.8.5)
mini_portile2 (2.8.6)
minima (2.5.1)
jekyll (>= 3.5, < 5.0)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
minitest (5.17.0)
multipart-post (2.1.1)
nokogiri (1.16.2)
nokogiri (1.16.5)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
octokit (4.22.0)
Expand All @@ -245,7 +245,8 @@ GEM
rb-fsevent (0.11.1)
rb-inotify (0.10.1)
ffi (~> 1.0)
rexml (3.2.5)
rexml (3.2.8)
strscan (>= 3.0.9)
rouge (3.26.0)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
Expand All @@ -260,6 +261,7 @@ GEM
faraday (> 0.8, < 2.0)
simpleidn (0.2.1)
unf (~> 0.1.4)
strscan (3.1.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thread_safe (0.3.6)
Expand Down
2 changes: 1 addition & 1 deletion docs/en/for-developers/installing-bhima-with-docker.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Installing BHIMA with Docker

Using Docker and Docker Compose provides a simpler alternative to the traditional [Linux installation method](./installing-bhima.md). To install Docker and Docker Compose, follow the instructions on [the official Docker website](https://docs.docker.com/engine/install/).
Using Docker and Docker Compose provides a simpler alternative to the traditional [Linux installation method](./installing-bhima.md). To install Docker and Docker Compose, follow the instructions on [the official Docker website](https://docs.docker.com/engine/install/). You will need to have installed docker to follow this guide.

### System Requirements

Expand Down
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
"debug": "^4.3.4",
"delay": "^5.0.0",
"dotenv": "^16.4.5",
"eslint-plugin-jsdoc": "^48.2.4",
"eslint-plugin-jsdoc": "^48.2.5",
"excel4node": "^1.8.2",
"express": "^4.19.2",
"express-handlebars": "^7.1.2",
Expand All @@ -146,7 +146,7 @@
"morgan": "^1.9.1",
"multer": "^1.4.5-lts.1",
"muze": "^1.2.1",
"mysql": "^2.16.0",
"mysql2": "^3.9.7",
"ng-file-upload": "^12.2.13",
"ngstorage": "^0.3.11",
"nodemailer": "^6.9.13",
Expand Down Expand Up @@ -201,8 +201,8 @@
"mocha": "^10.4.0",
"postcss": "^8.4.38",
"qs": "^6.12.1",
"release-it": "^17.2.1",
"sinon": "^17.0.2",
"release-it": "^17.3.0",
"sinon": "^18.0.0",
"standard-version": "^9.5.0",
"typescript": "^5.4.5"
},
Expand Down
6 changes: 5 additions & 1 deletion server/lib/db/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* eslint class-methods-use-this:off */
const q = require('q');
const mysql = require('mysql');
const mysql = require('mysql2');
const uuidParse = require('uuid-parse');
const _ = require('lodash');
const moment = require('moment');
Expand Down Expand Up @@ -33,6 +33,10 @@ class DatabaseConnector {
password : process.env.DB_PASS,
database : process.env.DB_NAME,

// https://sidorares.github.io/node-mysql2/docs/documentation#known-incompatibilities-with-node-mysql
// Ensure that numbers are returned as numbers, not strings.
decimalNumbers : true,

// NOTE(@jniles): the MySQL character set variable must be uppercase. To
// see the full list of check out:
// https://github.com/mysqljs/mysql/blob/master/lib/protocol/constants/charsets.js
Expand Down
Loading