Merge branch 'develop'

root 2021-09-29 15:30:00 +02:00
commit 582f4f5bce
2 changed files with 5 additions and 0 deletions

2
.gitignore vendored
View File

@ -6,6 +6,8 @@ pgtuner.yml
devel.yml devel.yml
custom/ custom/
.env .env
isard-sso/docker/api/src/api/static/templates/*.html
isard-sso/docker/api/src/api/static/templates/*.json
# Python compiled and cached # Python compiled and cached
*.pyc *.pyc

View File

@ -123,6 +123,9 @@ MOODLE_THEME_CBE=https://github.com/3iPunt/moodle_theme_cbe/archive/refs/heads/m
## NEXTCLOUD ## NEXTCLOUD
NEXTCLOUD_IMG=nextcloud:21.0.2-fpm-alpine NEXTCLOUD_IMG=nextcloud:21.0.2-fpm-alpine
## ONLYOFFICE
ONLYOFFICE_IMG=alehoho/oo-ce-docker-license:6.3.1.32
## WORDPRESS ## WORDPRESS
WORDPRESS_IMG=wordpress:5.7.2-php7.4-apache WORDPRESS_IMG=wordpress:5.7.2-php7.4-apache
WORDPRESS_CLI_IMG=wordpress:cli-2.5.0-php7.4 WORDPRESS_CLI_IMG=wordpress:cli-2.5.0-php7.4