holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove a couple of steps/layers, now that they work

Browse Source
This commit is contained in:
ralf 2023-01-12 21:19:19 -06:00
parent d9ddba7b9e
commit ef86af0740
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/docker/fpm/Dockerfile
View File

@ -75,8 +75,7 @@ exit $RESULT' \
&& composer.phar create-project $COMPOSER_EXTRA --prefer-dist --no-scripts --no-dev egroupware/egroupware:$VERSION \ && composer.phar create-project $COMPOSER_EXTRA --prefer-dist --no-scripts --no-dev egroupware/egroupware:$VERSION \
# clean up and remove caches # clean up and remove caches
&& composer.phar clear-cache \ && composer.phar clear-cache \
&& rm -f /usr/local/bin/composer.phar && 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) # 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 - \ && curl -fsSL https://deb.nodesource.com/setup_16.x | bash - \
&& apt-get install -y nodejs \ && apt-get install -y nodejs \
@ -88,8 +87,7 @@ RUN cd /usr/share/egroupware \
&& npm uninstall -g grunt-cli \ && npm uninstall -g grunt-cli \
&& npm cache clear --force \ && npm cache clear --force \
&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false zip \ && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false zip \
&& apt-get clean && apt-get clean \
RUN cd /usr/share/egroupware \
# create data directory # create data directory
&& mkdir -p /var/lib/egroupware/default/files/sqlfs \ && mkdir -p /var/lib/egroupware/default/files/sqlfs \
&& mkdir -p /var/lib/egroupware/default/backup \ && 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 \ && 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 # 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 \ && 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 # 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 \ && 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 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 && mv /usr/share/egroupware /usr/share/egroupware-sources