Compare commits

...

4 Commits

Author SHA1 Message Date
David Bomba
906cfb0c87 Merge pull request #453 from Psycho0verload/master
[BUGFIX] Error building the mysql backup build
2022-07-22 20:15:03 +10:00
Jonathan Starck
62a7f6d7cf [BUGFIX] TRUSTED_PROXIES is not in env
Bugfix for Issue #454
2022-07-22 12:08:42 +02:00
Jonathan Starck
1d97234b51 Change MYSQL5 to MYSQL5-Debian so that build works for the backup cronjob 2022-07-20 18:06:34 +02:00
David Bomba
aab280dcc1 Prep container for PHP 8.1 (#450) 2022-07-20 23:32:52 +08:00
4 changed files with 6 additions and 4 deletions

View File

@@ -1,4 +1,4 @@
ARG PHP_VERSION=7.4
ARG PHP_VERSION=8.1
ARG BAK_STORAGE_PATH=/var/www/app/docker-backup-storage/
ARG BAK_PUBLIC_PATH=/var/www/app/docker-backup-public/
@@ -28,7 +28,7 @@ RUN --mount=target=/var/www/app/node_modules,type=cache \
&& mv /var/www/app/public $BAK_PUBLIC_PATH
# Prepare php image
FROM php:${PHP_VERSION}-fpm-alpine3.13 as prod
FROM php:${PHP_VERSION}-fpm-alpine3.15 as prod
LABEL maintainer="David Bomba <turbo124@gmail.com>"

View File

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

View File

@@ -38,7 +38,7 @@ services:
- "in5.localhost:192.168.0.124 " #host and ip
db:
image: mysql:5
image: mysql:5-debian
# 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

2
env
View File

@@ -5,6 +5,8 @@ APP_DEBUG=true
REQUIRE_HTTPS=false
PHANTOMJS_PDF_GENERATION=false
PDF_GENERATOR=snappdf
TRUSTED_PROXIES='*'
QUEUE_CONNECTION=database