extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

build development Docker images now based on Ubuntu 22.04 and by default with PHP 8.1

Browse Source 
docker-compose.yml uses now mariadb:10.6 with automatic upgrade enabled
This commit is contained in:
ralf 2022-09-20 11:16:03 +02:00
parent d6d0dd21a4
commit 0368173487
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/docker/development/Dockerfile
View File

@ -3,7 +3,7 @@
## EGroupware development container using Ubuntu 20.04 and PHP from ondrej/php PPA ## EGroupware development container using Ubuntu 20.04 and PHP 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
@ -89,4 +89,4 @@ EXPOSE 9000
ADD entrypoint.sh / ADD entrypoint.sh /
CMD ["php-fpm", "--nodaemonize"] CMD ["php-fpm", "--nodaemonize"]
ENTRYPOINT ["/entrypoint.sh"] ENTRYPOINT ["/entrypoint.sh"]

4
doc/docker/development/build.sh
View File

@ -2,12 +2,12 @@
REPO=egroupware REPO=egroupware
IMAGE=development IMAGE=development
BASE=ubuntu:20.04 BASE=ubuntu:22.04
RECOMMENDED_PHP_VERSION=8.1 RECOMMENDED_PHP_VERSION=8.1
PHP_VERSION=${1:-8.1} PHP_VERSION=${1:-8.1}
TAG=$(docker run --rm -i --entrypoint bash $REPO/$IMAGE:$PHP_VERSION -c "apt update && apt search php$PHP_VERSION-fpm" 2>/dev/null|grep php$PHP_VERSION-fpm|sed "s|^php$PHP_VERSION-fpm/focal[^ ]* \([78]\.[0-9]*\.[0-9]*\).*|\1|g") TAG=$(docker run --rm -i --entrypoint bash $REPO/$IMAGE:$PHP_VERSION -c "apt update && apt search php$PHP_VERSION-fpm" 2>/dev/null|grep php$PHP_VERSION-fpm|sed "s|^php$PHP_VERSION-fpm/focal[^ ]* .*\([78]\.[0-9]*\.[0-9]*\).*|\1|g")
test -z "$TAG" && { test -z "$TAG" && {
echo "Can't get new tag of $REPO/$IMAGE container --> existing" echo "Can't get new tag of $REPO/$IMAGE container --> existing"
exit 1 exit 1

15
doc/docker/development/docker-compose.yml
View File

@ -102,14 +102,12 @@ services:
# #
# extra non-default apps (need to start with EGW_EXTRA_APP!) # extra non-default apps (need to start with EGW_EXTRA_APP!)
# #
# new push server not yet in composer.json
- EGW_EXTRA_APP_PUSH=https://github.com/EGroupware/swoolepush.git
# EPL apps (need extra credentials!) # EPL apps (need extra credentials!)
#- EGW_EXTRA_APPS_EPL=https://github.com/EGroupwareGmbH/epl.git https://github.com/EGroupwareGmbH/esyncpro.git https://github.com/EGroupwareGmbH/policy.git https://github.com/EGroupwareGmbH/webauthn.git #- EGW_EXTRA_APPS_EPL=https://github.com/EGroupwareGmbH/epl.git https://github.com/EGroupwareGmbH/esyncpro.git https://github.com/EGroupwareGmbH/policy.git https://github.com/EGroupwareGmbH/webauthn.git
# old Wiki # old Wiki
- EGW_EXTRA_APP_WIKI=https://github.com/EGroupware/wiki.git #- EGW_EXTRA_APP_WIKI=https://github.com/EGroupware/wiki.git
# old API and eTemplate(1) # old API and eTemplate(1), required for upgrades from before 14.3
- EGW_EXTRA_APP_OLDAPI=https://github.com/EGroupware/phpgwapi.git https://github.com/EGroupware/etemplate.git #- EGW_EXTRA_APP_OLDAPI=https://github.com/EGroupware/phpgwapi.git https://github.com/EGroupware/etemplate.git
# #
# XDEBUG_REMOTE_HOST need to be set, if the host running the IDE is different from 172.17.0.1 (Mac can use docker.for.mac.localhost) # XDEBUG_REMOTE_HOST need to be set, if the host running the IDE is different from 172.17.0.1 (Mac can use docker.for.mac.localhost)
- XDEBUG_REMOTE_HOST=docker.for.mac.localhost - XDEBUG_REMOTE_HOST=docker.for.mac.localhost
@ -146,12 +144,13 @@ services:
container_name: egroupware-nginx container_name: egroupware-nginx
restart: always restart: always
# run an own MariaDB:10.5 (you can use EGroupware's database backup and restore to add your existing database) # run an own MariaDB:10.6 (you can use EGroupware's database backup and restore to add your existing database)
db: db:
image: mariadb:10.5 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
# to add an own persistent configuration # to add an own persistent configuration
@ -283,4 +282,4 @@ services:
# volumes: # volumes:
# - /var/run/docker.sock:/var/run/docker.sock # - /var/run/docker.sock:/var/run/docker.sock
# - portainer_data:/data # - portainer_data:/data
# container_name: portainer # container_name: portainer