mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 06:30:59 +01:00
building 22.1 images with PHP 8.1 on base of Ubuntu 22.04 and MariaDB 10.6
This commit is contained in:
parent
67f41f8041
commit
7072f96244
@ -53,7 +53,7 @@ volumes:
|
|||||||
device: $PWD/data/default/rocketchat/uploads
|
device: $PWD/data/default/rocketchat/uploads
|
||||||
services:
|
services:
|
||||||
egroupware:
|
egroupware:
|
||||||
image: egroupware/egroupware:20.1
|
image: egroupware/egroupware:22.1
|
||||||
# EPL image: download.egroupware.org/egroupware/epl:20.1
|
# EPL image: download.egroupware.org/egroupware/epl:20.1
|
||||||
# setting a default language for a new installation
|
# setting a default language for a new installation
|
||||||
#environment:
|
#environment:
|
||||||
@ -139,10 +139,11 @@ services:
|
|||||||
|
|
||||||
# run an own MariaDB:10.4 (you can use EGroupware's database backup and restore to add your existing database)
|
# run an own MariaDB:10.4 (you can use EGroupware's database backup and restore to add your existing database)
|
||||||
db:
|
db:
|
||||||
image: mariadb
|
image: mariadb:10.6
|
||||||
environment:
|
environment:
|
||||||
#- MYSQL_ROOT=root
|
#- MYSQL_ROOT=root
|
||||||
- MYSQL_ROOT_PASSWORD=secret
|
- MYSQL_ROOT_PASSWORD=secret
|
||||||
|
- MARIADB_AUTO_UPGRADE=true
|
||||||
volumes:
|
volumes:
|
||||||
- db:/var/lib/mysql
|
- db:/var/lib/mysql
|
||||||
container_name: egroupware-db
|
container_name: egroupware-db
|
||||||
|
@ -3,11 +3,11 @@
|
|||||||
## EGroupware FPM container using Ubuntu 18.04 and PHP 7.3 from ondrej/php PPA
|
## EGroupware FPM container using Ubuntu 18.04 and PHP 7.3 from ondrej/php PPA
|
||||||
##
|
##
|
||||||
################################################################################
|
################################################################################
|
||||||
FROM ubuntu:20.04
|
FROM ubuntu:22.04
|
||||||
MAINTAINER rb@egroupware.org
|
MAINTAINER rb@egroupware.org
|
||||||
|
|
||||||
ARG VERSION=dev-master
|
ARG VERSION=dev-master
|
||||||
ARG PHP_VERSION=7.4
|
ARG PHP_VERSION=8.1
|
||||||
|
|
||||||
# keeping build-arg in environment for entrypoint.sh
|
# keeping build-arg in environment for entrypoint.sh
|
||||||
ENV VERSION=$VERSION
|
ENV VERSION=$VERSION
|
||||||
|
Loading…
Reference in New Issue
Block a user