Compare commits

...

10 Commits

Author SHA1 Message Date
Jonathan Starck
4aa7a7032c Add native support MYSQL8 (#462)
* Add native Support for MYSQL Version 8.x

* Adaptation of the documentation for MYSQL 8.x

* Backup note added
2022-10-27 17:37:07 +08:00
David Bomba
4fa02c2785 Merge pull request #464 from turbo124/master
Fixes for fonts
2022-10-06 12:54:05 +11:00
David Bomba
d25210c8b9 Fixes for fonts 2022-10-06 12:53:44 +11:00
David Bomba
f97fdda827 Merge pull request #463 from turbo124/master
Additional fonts - chinese + arabic
2022-10-06 12:35:27 +11:00
David Bomba
5188c45b41 Upgrade fonts 2022-10-06 12:34:52 +11:00
David Bomba
e3873bcac2 Merge branch 'master' of https://github.com/turbo124/dockerfiles 2022-10-06 12:32:11 +11:00
David Bomba
24ef742ce1 Update README.md 2022-10-02 20:41:25 +11:00
David Bomba
886dfe7832 Update README.md 2022-10-02 20:41:04 +11:00
David Bomba
0054620e55 Merge branch 'master' of https://github.com/turbo124/dockerfiles 2022-08-19 14:12:07 +10:00
David Bomba
faffcadc45 Prep container for PHP 8.1 2022-07-20 13:05:12 +10:00
4 changed files with 11 additions and 6 deletions

View File

@@ -4,8 +4,6 @@
[![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/invoiceninja)](https://artifacthub.io/packages/search?repo=invoiceninja) [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/invoiceninja)](https://artifacthub.io/packages/search?repo=invoiceninja)
[![Pusblish Image](https://github.com/invoiceninja/dockerfiles/actions/workflows/publish-image.yaml/badge.svg)](https://github.com/invoiceninja/dockerfiles/actions/workflows/publish-image.yaml) [![Cache v5 Image](https://github.com/invoiceninja/dockerfiles/actions/workflows/build-image-v5.yaml/badge.svg)](https://github.com/invoiceninja/dockerfiles/actions/workflows/build-image-v5.yaml) [![Pusblish Image](https://github.com/invoiceninja/dockerfiles/actions/workflows/publish-image.yaml/badge.svg)](https://github.com/invoiceninja/dockerfiles/actions/workflows/publish-image.yaml) [![Cache v5 Image](https://github.com/invoiceninja/dockerfiles/actions/workflows/build-image-v5.yaml/badge.svg)](https://github.com/invoiceninja/dockerfiles/actions/workflows/build-image-v5.yaml)
# Docker for [Invoice Ninja](https://www.invoiceninja.com/) # Docker for [Invoice Ninja](https://www.invoiceninja.com/)
:crown: **Features** :crown: **Features**
@@ -22,7 +20,8 @@ Introducing our very own [Helm Chart](https://github.com/invoiceninja/dockerfile
Other resources: Other resources:
[Helm Chart](https://github.com/Saddamus/invoiceninja-helm) by @Saddamus [Helm Chart](https://github.com/Saddamus/invoiceninja-helm) by @Saddamus
[K8s Manifest](https://github.com/invoiceninja/dockerfiles/issues/94) by @spacepluk [K8s Manifest](https://github.com/invoiceninja/dockerfiles/issues/94) by @spacepluk
[You Tube installation video by DBTech](https://www.youtube.com/watch?v=xo6a3KtLC2g&ab_channel=DBTech)
## Alternatively get started with Docker Compose ## Alternatively get started with Docker Compose
@@ -84,7 +83,7 @@ All that is left to do now is bring up the container
### Running on ARM64 (Raspberry Pi 4) ### 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. When deploying on an ARM64 system, you need to comment out the `image: mysql:8` 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`
@@ -96,6 +95,7 @@ To upgrade to a newer release image, please make sure to update the `docker-comp
git pull git pull
``` ```
It is recommended to perform a backup before.
You may need to manually merge any changes that cannot be merged automatically by git. You may need to manually merge any changes that cannot be merged automatically by git.
### Thanks ### Thanks

View File

@@ -32,6 +32,10 @@ FROM php:${PHP_VERSION}-fpm-alpine3.15 as prod
LABEL maintainer="David Bomba <turbo124@gmail.com>" LABEL maintainer="David Bomba <turbo124@gmail.com>"
# Adding caching_sha2_password.so
# With this we get native support for caching_sha2_password
RUN apk add --no-cache mariadb-connector-c
RUN mv /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini RUN mv /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
# Install PHP extensions # Install PHP extensions
@@ -53,6 +57,7 @@ RUN install-php-extensions \
# Install chromium # Install chromium
RUN set -eux; \ RUN set -eux; \
apk add --no-cache \ apk add --no-cache \
font-isas-misc \
supervisor \ supervisor \
mysql-client \ mysql-client \
git \ git \

View File

@@ -1,4 +1,4 @@
FROM mysql:5 FROM mysql:8
# When running on ARM64 use MariaDB instead of MySQL # When running on ARM64 use MariaDB instead of MySQL
#FROM mariadb:10.4 #FROM mariadb:10.4
ENV force_color_prompt yes ENV force_color_prompt yes

View File

@@ -38,7 +38,7 @@ services:
- "in5.localhost:192.168.0.124 " #host and ip - "in5.localhost:192.168.0.124 " #host and ip
db: db:
image: mysql:5 image: mysql:8
# When running on ARM64 use MariaDB instead of MySQL # When running on ARM64 use MariaDB instead of MySQL
# image: mariadb:10.4 # 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