From ef86af074039cc300e411fd879ec3aba880e5111 Mon Sep 17 00:00:00 2001 From: ralf Date: Thu, 12 Jan 2023 21:19:19 -0600 Subject: [PATCH] remove a couple of steps/layers, now that they work --- doc/docker/fpm/Dockerfile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/doc/docker/fpm/Dockerfile b/doc/docker/fpm/Dockerfile index b2280fc5f0..c3d61ecd8d 100644 --- a/doc/docker/fpm/Dockerfile +++ b/doc/docker/fpm/Dockerfile @@ -75,8 +75,7 @@ exit $RESULT' \ && composer.phar create-project $COMPOSER_EXTRA --prefer-dist --no-scripts --no-dev egroupware/egroupware:$VERSION \ # clean up and remove caches && composer.phar clear-cache \ - && rm -f /usr/local/bin/composer.phar -RUN cd /usr/share/egroupware \ + && rm -f /usr/local/bin/composer.phar \ # 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-get install -y nodejs \ @@ -88,8 +87,7 @@ RUN cd /usr/share/egroupware \ && npm uninstall -g grunt-cli \ && npm cache clear --force \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false zip \ - && apt-get clean -RUN cd /usr/share/egroupware \ + && apt-get clean \ # create data directory && mkdir -p /var/lib/egroupware/default/files/sqlfs \ && mkdir -p /var/lib/egroupware/default/backup \ @@ -102,9 +100,9 @@ RUN cd /usr/share/egroupware \ && ln -s /var/lib/egroupware-push/config.inc.php /usr/share/egroupware/swoolepush \ # install cron-job and disable fallback async service and ability to switch them off in admin && sed 's/apache/www-data/' doc/rpm-build/egroupware.cron > /etc/cron.d/egroupware \ - && patch -p1 < doc/rpm-build/asyncservice.patch + && 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 >/dev/null 2>&1 || apt-get install -y libldap-common \ + && 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