Compare commits

...

2 Commits

Author SHA1 Message Date
Thibaut De Muynck
62b1d8cb94 Added MariaDB to Docker compose for ARM64 (#315)
* Added option to use MariaDB instead of MySQL

* Moved MYSQL environment variables to env file
2021-04-06 09:29:04 +08:00
Ween Jiann
4cd773700e Update .gitignore 2021-04-05 17:31:27 +08:00
5 changed files with 28 additions and 17 deletions

3
.gitignore vendored
View File

@@ -9,3 +9,6 @@ Thumbs.db
# Helm # Helm
charts/**/charts/ charts/**/charts/
# Compose filesystem
/docker

View File

@@ -17,7 +17,7 @@
## Quickstart V5 Launch ## Quickstart V5 Launch
The dockerfile has been revamped to make is easier to get started, by default the base image selected in 5 which will pull in the latest v5 stable image. The dockerfile has been revamped to make it easier to get started, by default the base image selected is 5 which will pull in the latest v5 stable image.
```bash ```bash
git clone https://github.com/invoiceninja/dockerfiles.git git clone https://github.com/invoiceninja/dockerfiles.git
@@ -65,7 +65,7 @@ For example, lets say your APP_URL is ```http://in5.test:8000``` and your LAN IP
```192.168.0.124 in5.test``` ```192.168.0.124 in5.test```
**Please note that PDF generation using local host your domain name MUST end in .test for your PDFs to generate correctly, this is a DNS resolver issue with chromium. **Please note that for PDF generation using local host, your domain name MUST end in .test for your PDFs to generate correctly, this is a DNS resolver issue with chromium.
All that is left to do now is bring up the container All that is left to do now is bring up the container
@@ -75,6 +75,10 @@ All that is left to do now is bring up the container
**Note: When performing the setup, the Database host is ```db``` **Note: When performing the setup, the Database host is ```db```
### Running on ARM64 (Raspberry Pi 4)
When deploying on an ARM64 system, you need to comment out the `image: mysql:5` line and uncomment `image: mariadb:10.4` in the `docker-compose.yml` file.
## Updating the Image when using `docker-compose` ## Updating the Image when using `docker-compose`
As `docker-compose` does not support any form of version control, this git provide updates to `docker-compose.yml` directly. As `docker-compose` does not support any form of version control, this git provide updates to `docker-compose.yml` directly.

View File

@@ -1,4 +1,6 @@
FROM mysql:5 FROM mysql:5
# When running on ARM64 use MariaDB instead of MySQL
#FROM mariadb:10.4
ENV force_color_prompt yes ENV force_color_prompt yes
RUN apt-get update; RUN apt-get update;

View File

@@ -39,17 +39,15 @@ services:
db: db:
image: mysql:5 image: mysql:5
# When running on ARM64 use MariaDB instead of MySQL
# image: mariadb:10.4
# For auto DB backups comment out image and use the build block below # For auto DB backups comment out image and use the build block below
# build: # build:
# context: ./config/mysql # context: ./config/mysql
ports: ports:
- "3305:3306" - "3305:3306"
restart: always restart: always
environment: env_file: env
- MYSQL_ROOT_PASSWORD=ninjaAdm1nPassword
- MYSQL_USER=ninja
- MYSQL_PASSWORD=ninja
- MYSQL_DATABASE=ninja
volumes: volumes:
- ./docker/mysql/data:/var/lib/mysql:rw,delegated - ./docker/mysql/data:/var/lib/mysql:rw,delegated

4
env
View File

@@ -7,6 +7,10 @@ DB_PORT1=3306
DB_USERNAME1=ninja DB_USERNAME1=ninja
DB_PASSWORD1=ninja DB_PASSWORD1=ninja
DB_DATABASE1=ninja DB_DATABASE1=ninja
MYSQL_ROOT_PASSWORD=ninjaAdm1nPassword
MYSQL_USER=ninja
MYSQL_PASSWORD=ninja
MYSQL_DATABASE=ninja
#this is a system variable please do not remove #this is a system variable please do not remove
IS_DOCKER=true IS_DOCKER=true