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

pending changes

Browse Source
This commit is contained in:
Ralf Becker 2020-06-28 09:22:31 +02:00
parent ed8fb28f8e
commit c24ecef879
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/docker/fpm/build.sh
View File

@ -7,7 +7,6 @@ BRANCH=$(echo $VERSION|sed 's/\.[0-9]\{8\}$//')
[ $VERSION = $BRANCH ] && VERSION="$BRANCH.x-dev" [ $VERSION = $BRANCH ] && VERSION="$BRANCH.x-dev"
[ $VERSION = "$DEFAULT.x-dev" ] && { [ $VERSION = "$DEFAULT.x-dev" ] && {
cd $(dirname $0)
grep self.version composer.json | while read pack version; do composer update $(echo $pack|cut -d'"' -f2); done grep self.version composer.json | while read pack version; do composer update $(echo $pack|cut -d'"' -f2); done
git status composer.lock|grep composer.lock && { git status composer.lock|grep composer.lock && {
git stash; git pull --rebase; git stash pop git stash; git pull --rebase; git stash pop

5
doc/docker/nginx.conf
View File

@ -80,6 +80,11 @@ server {
proxy_pass http://push:9501; proxy_pass http://push:9501;
} }
# SmallParT videos
location /egroupware/smallpart/Resources/Videos {
alias /var/lib/egroupware/default/files/smallpart;
}
# PHP in docroot # PHP in docroot
#location ~ \.php { #location ~ \.php {
# fastcgi_pass fpm; # fastcgi_pass fpm;