diff --git a/README.md b/README.md index e457c0e..bc78547 100644 --- a/README.md +++ b/README.md @@ -83,7 +83,7 @@ All that is left to do now is bring up the container ### 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` @@ -95,6 +95,7 @@ To upgrade to a newer release image, please make sure to update the `docker-comp 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. ### Thanks diff --git a/alpine/5/Dockerfile b/alpine/5/Dockerfile index 98cf01a..54cf6a3 100644 --- a/alpine/5/Dockerfile +++ b/alpine/5/Dockerfile @@ -32,6 +32,10 @@ FROM php:${PHP_VERSION}-fpm-alpine3.15 as prod LABEL maintainer="David Bomba " +# 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 # Install PHP extensions diff --git a/config/mysql/Dockerfile b/config/mysql/Dockerfile index c9271fd..0129e83 100644 --- a/config/mysql/Dockerfile +++ b/config/mysql/Dockerfile @@ -1,4 +1,4 @@ -FROM mysql:5 +FROM mysql:8 # When running on ARM64 use MariaDB instead of MySQL #FROM mariadb:10.4 ENV force_color_prompt yes diff --git a/docker-compose.yml b/docker-compose.yml index fdd5760..19ed2b7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -38,7 +38,7 @@ services: - "in5.localhost:192.168.0.124 " #host and ip db: - image: mysql:5 + image: mysql:8 # 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