2
0
Fork 0
mirror of https://github.com/friendica/docker synced 2025-12-07 13:57:07 +01:00

Fixings for offical-images

- Fixed *.sh mode
- Removed label
- Fixed RUN settings
- Removed superfluous debMultiarch
This commit is contained in:
Philipp Holzer 2019-08-25 22:58:48 +02:00
commit 43eefc24ff
No known key found for this signature in database
GPG key ID: D8365C3D36B77D90
32 changed files with 29 additions and 58 deletions

View file

@ -1,5 +1,4 @@
FROM php:%%PHP_VERSION%%-%%VARIANT%%-stretch
LABEL maintainer="Philipp Holzer <admin@philipp.info>"
# entrypoint.sh and cron.sh dependencies
RUN set -ex; \
@ -44,9 +43,6 @@ RUN set -ex; \
curl \
libzip-dev \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
\
docker-php-ext-configure gd \
--with-gd \
--with-freetype-dir=/usr/include/ \
@ -97,7 +93,8 @@ RUN set -ex; \
rm -rf /var/lib/apt/lists/*
# set recommended PHP.ini settings
RUN { \
RUN set -ex; \
{ \
echo 'opcache.enable=1' ; \
echo 'opcache.interned_strings_buffer=8'; \
echo 'opcache.max_accelerated_files=10000'; \
@ -127,7 +124,6 @@ ENV FRIENDICA_ADDONS %%VERSION%%
COPY *.sh upgrade.exclude /
COPY config/* /usr/src/friendica/config/
RUN chmod +x /*.sh
ENTRYPOINT ["/entrypoint.sh"]
CMD ["%%CMD%%"]