extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-25 16:19:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

reverting to ubuntu:20.04 based images as current 22.04 images require Docker features not available on old Docker versions used by current Ubuntu and Debian :(

Browse Source 
--> update and cron working again and also installing of further packages (like vim) in the container
This commit is contained in:
ralf 2023-01-10 18:58:24 -06:00
parent 2e200baa08
commit df6bfdc54b
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/docker/fpm/Dockerfile
View File

@ -3,7 +3,7 @@
## EGroupware FPM container using Ubuntu 18.04 and PHP 7.3 from ondrej/php PPA
##
################################################################################
FROM ubuntu:22.04
FROM ubuntu:20.04
MAINTAINER rb@egroupware.org
ARG VERSION=dev-master
@ -78,7 +78,7 @@ exit $RESULT' \
&& rm -f /usr/local/bin/composer.phar
RUN cd /usr/share/egroupware \
# install nodejs 16.x PPA (Shoelace requires >= 14.17, Ubuntu 22.04 only has 12.x)
&& curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && apt update \
&& curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \
&& apt-get install -y nodejs \
&& npm install -g grunt-cli \
&& npm install \
@ -104,7 +104,7 @@ RUN cd /usr/share/egroupware \
&& sed 's/apache/www-data/' doc/rpm-build/egroupware.cron > /etc/cron.d/egroupware \
&& patch -p1 < doc/rpm-build/asyncservice.patch
# disable certificate checks for LDAP as most LDAP and AD servers have no "valid" cert
RUN ls /etc/ldap/ldap.conf || apt-get install -y libldap-common \
RUN ls /etc/ldap/ldap.conf >/dev/null 2>&1 || apt-get install -y libldap-common \
&& echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf \
# mv sources to a different directory so entrypoint can rsync them to volumn for both nginx and fpm
&& mv /usr/share/egroupware /usr/share/egroupware-sources

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

@ -31,7 +31,7 @@ BRANCH=$(echo $VERSION|sed 's/\.[0-9]\{8\}$//')
# add PHP_VERSION to TAG, if not the default PHP version
[ $PHP_VERSION != $DEFAULT_PHP_VERSION ] && TAG=$TAG-$PHP_VERSION
docker pull ubuntu:22.04
docker pull ubuntu:20.04
docker build --build-arg "VERSION=$VERSION" --build-arg "PHP_VERSION=$PHP_VERSION" -t egroupware/egroupware:$TAG . && {
docker push egroupware/egroupware:$TAG
# further tags are only for the default PHP version

5
doc/docker/fpm/entrypoint.sh
View File

@ -62,7 +62,7 @@ chmod 600 $LOG
# run rollup / npm run build, to include extra apps JS in rollup build
ls /usr/share/egroupware-extra/*/js >/dev/null 2>&1 && {
cd /usr/share/egroupware
#exit npm run build
npm run build
}
max_retries=10
@ -102,7 +102,6 @@ for f in /etc/crontab /etc/cron.*/*; do
}
done
# to run async jobs
#service cron start
/etc/init.d/cron start
service cron start
exec "$@"