fossilfranv/monica
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove useless php modules (#22)

Browse Source
This commit is contained in:
Alexis Saettler 2020-07-05 13:48:39 +02:00 committed by GitHub
parent b14e1fad85
commit 9567576624
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 21 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/build.yml vendored
View File

@ -26,6 +26,7 @@ jobs:
- name: Build image ${{ matrix.variant }} ${{ matrix.arch }} - name: Build image ${{ matrix.variant }} ${{ matrix.arch }}
run: | run: |
docker pull php:7.3-${{ matrix.variant }}
docker build ${{ matrix.variant }} -t monica:${{ matrix.variant }} docker build ${{ matrix.variant }} -t monica:${{ matrix.variant }}
docker images docker images

3
.templates/Dockerfile-extra.template
View File

@ -12,6 +12,7 @@ ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" \
PHP_OPCACHE_MAX_WASTED_PERCENTAGE="10" PHP_OPCACHE_MAX_WASTED_PERCENTAGE="10"
RUN set -ex; \ RUN set -ex; \
\ \
docker-php-ext-enable opcache; \
{ \ { \
echo '[opcache]'; \ echo '[opcache]'; \
echo 'opcache.enable=1'; \ echo 'opcache.enable=1'; \
@ -34,3 +35,5 @@ WORKDIR /var/www/html
# Define Monica version # Define Monica version
ENV MONICA_VERSION %%VERSION%% ENV MONICA_VERSION %%VERSION%%
LABEL org.opencontainers.image.revision="%%COMMIT%%" \
org.opencontainers.image.version="%%VERSION%%"

4
.templates/Dockerfile-label.template
View File

@ -2,7 +2,5 @@ LABEL org.opencontainers.image.authors="Alexis Saettler <alexis@saettler.org>" \
org.opencontainers.image.title="MonicaHQ, the Personal Relationship Manager" \ org.opencontainers.image.title="MonicaHQ, the Personal Relationship Manager" \
org.opencontainers.image.description="This is MonicaHQ, your personal memory! MonicaHQ is like a CRM but for the friends, family, and acquaintances around you." \ org.opencontainers.image.description="This is MonicaHQ, your personal memory! MonicaHQ is like a CRM but for the friends, family, and acquaintances around you." \
org.opencontainers.image.url="https://monicahq.com" \ org.opencontainers.image.url="https://monicahq.com" \
org.opencontainers.image.revision="%%COMMIT%%" \
org.opencontainers.image.source="https://github.com/monicahq/docker" \ org.opencontainers.image.source="https://github.com/monicahq/docker" \
org.opencontainers.image.vendor="Monica" \ org.opencontainers.image.vendor="Monica"
org.opencontainers.image.version="%%VERSION%%"

6
Dockerfile-alpine.template
View File

@ -21,7 +21,6 @@ RUN set -ex; \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
jpeg-dev \ jpeg-dev \
gmp-dev \ gmp-dev \
libsodium-dev \
libmemcached-dev \ libmemcached-dev \
; \ ; \
\ \
@ -36,17 +35,12 @@ RUN set -ex; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
intl \ intl \
zip \ zip \
json \
iconv \
bcmath \ bcmath \
gd \ gd \
gmp \ gmp \
pdo_mysql \ pdo_mysql \
mysqli \ mysqli \
soap \ soap \
sodium \
mbstring \
opcache \
; \ ; \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-%%APCU_VERSION%%; \ pecl install APCu-%%APCU_VERSION%%; \

6
Dockerfile-debian.template
View File

@ -25,7 +25,6 @@ RUN set -ex; \
libfreetype6-dev \ libfreetype6-dev \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libgmp-dev \ libgmp-dev \
libsodium-dev \
libmemcached-dev \ libmemcached-dev \
; \ ; \
\ \
@ -37,17 +36,12 @@ RUN set -ex; \
docker-php-ext-install -j$(nproc) \ docker-php-ext-install -j$(nproc) \
intl \ intl \
zip \ zip \
json \
iconv \
bcmath \ bcmath \
gd \ gd \
gmp \ gmp \
pdo_mysql \ pdo_mysql \
mysqli \ mysqli \
soap \ soap \
sodium \
mbstring \
opcache \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately

15
apache/Dockerfile
View File

@ -5,10 +5,8 @@ LABEL org.opencontainers.image.authors="Alexis Saettler <alexis@saettler.org>" \
org.opencontainers.image.title="MonicaHQ, the Personal Relationship Manager" \ org.opencontainers.image.title="MonicaHQ, the Personal Relationship Manager" \
org.opencontainers.image.description="This is MonicaHQ, your personal memory! MonicaHQ is like a CRM but for the friends, family, and acquaintances around you." \ org.opencontainers.image.description="This is MonicaHQ, your personal memory! MonicaHQ is like a CRM but for the friends, family, and acquaintances around you." \
org.opencontainers.image.url="https://monicahq.com" \ org.opencontainers.image.url="https://monicahq.com" \
org.opencontainers.image.revision="186f336799df2740df28198bfd2431f206668ff2" \
org.opencontainers.image.source="https://github.com/monicahq/docker" \ org.opencontainers.image.source="https://github.com/monicahq/docker" \
org.opencontainers.image.vendor="Monica" \ org.opencontainers.image.vendor="Monica"
org.opencontainers.image.version="v2.18.0"
# entrypoint.sh dependencies # entrypoint.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -35,7 +33,6 @@ RUN set -ex; \
libfreetype6-dev \ libfreetype6-dev \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libgmp-dev \ libgmp-dev \
libsodium-dev \
libmemcached-dev \ libmemcached-dev \
; \ ; \
\ \
@ -47,23 +44,18 @@ RUN set -ex; \
docker-php-ext-install -j$(nproc) \ docker-php-ext-install -j$(nproc) \
intl \ intl \
zip \ zip \
json \
iconv \
bcmath \ bcmath \
gd \ gd \
gmp \ gmp \
pdo_mysql \ pdo_mysql \
mysqli \ mysqli \
soap \ soap \
sodium \
mbstring \
opcache \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.18; \ pecl install APCu-5.1.18; \
pecl install memcached-3.1.5; \ pecl install memcached-3.1.5; \
pecl install redis-5.2.2; \ pecl install redis-5.3.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
@ -99,6 +91,7 @@ ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" \
PHP_OPCACHE_MAX_WASTED_PERCENTAGE="10" PHP_OPCACHE_MAX_WASTED_PERCENTAGE="10"
RUN set -ex; \ RUN set -ex; \
\ \
docker-php-ext-enable opcache; \
{ \ { \
echo '[opcache]'; \ echo '[opcache]'; \
echo 'opcache.enable=1'; \ echo 'opcache.enable=1'; \
@ -136,6 +129,8 @@ WORKDIR /var/www/html
# Define Monica version # Define Monica version
ENV MONICA_VERSION v2.18.0 ENV MONICA_VERSION v2.18.0
LABEL org.opencontainers.image.revision="186f336799df2740df28198bfd2431f206668ff2" \
org.opencontainers.image.version="%%VERSION%%"
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \

1
build.sh
View File

@ -3,6 +3,7 @@ set -ex
for variant in apache fpm fpm-alpine; do for variant in apache fpm fpm-alpine; do
pushd $variant pushd $variant
docker pull php:7.3-$variant
docker build --no-cache -t monica:$variant . docker build --no-cache -t monica:$variant .
popd popd
done done

15
fpm-alpine/Dockerfile
View File

@ -5,10 +5,8 @@ LABEL org.opencontainers.image.authors="Alexis Saettler <alexis@saettler.org>" \
org.opencontainers.image.title="MonicaHQ, the Personal Relationship Manager" \ org.opencontainers.image.title="MonicaHQ, the Personal Relationship Manager" \
org.opencontainers.image.description="This is MonicaHQ, your personal memory! MonicaHQ is like a CRM but for the friends, family, and acquaintances around you." \ org.opencontainers.image.description="This is MonicaHQ, your personal memory! MonicaHQ is like a CRM but for the friends, family, and acquaintances around you." \
org.opencontainers.image.url="https://monicahq.com" \ org.opencontainers.image.url="https://monicahq.com" \
org.opencontainers.image.revision="186f336799df2740df28198bfd2431f206668ff2" \
org.opencontainers.image.source="https://github.com/monicahq/docker" \ org.opencontainers.image.source="https://github.com/monicahq/docker" \
org.opencontainers.image.vendor="Monica" \ org.opencontainers.image.vendor="Monica"
org.opencontainers.image.version="v2.18.0"
# entrypoint.sh dependencies # entrypoint.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -31,7 +29,6 @@ RUN set -ex; \
libjpeg-turbo-dev \ libjpeg-turbo-dev \
jpeg-dev \ jpeg-dev \
gmp-dev \ gmp-dev \
libsodium-dev \
libmemcached-dev \ libmemcached-dev \
; \ ; \
\ \
@ -46,22 +43,17 @@ RUN set -ex; \
docker-php-ext-install -j "$(nproc)" \ docker-php-ext-install -j "$(nproc)" \
intl \ intl \
zip \ zip \
json \
iconv \
bcmath \ bcmath \
gd \ gd \
gmp \ gmp \
pdo_mysql \ pdo_mysql \
mysqli \ mysqli \
soap \ soap \
sodium \
mbstring \
opcache \
; \ ; \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.18; \ pecl install APCu-5.1.18; \
pecl install memcached-3.1.5; \ pecl install memcached-3.1.5; \
pecl install redis-5.2.2; \ pecl install redis-5.3.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
@ -92,6 +84,7 @@ ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" \
PHP_OPCACHE_MAX_WASTED_PERCENTAGE="10" PHP_OPCACHE_MAX_WASTED_PERCENTAGE="10"
RUN set -ex; \ RUN set -ex; \
\ \
docker-php-ext-enable opcache; \
{ \ { \
echo '[opcache]'; \ echo '[opcache]'; \
echo 'opcache.enable=1'; \ echo 'opcache.enable=1'; \
@ -114,6 +107,8 @@ WORKDIR /var/www/html
# Define Monica version # Define Monica version
ENV MONICA_VERSION v2.18.0 ENV MONICA_VERSION v2.18.0
LABEL org.opencontainers.image.revision="186f336799df2740df28198bfd2431f206668ff2" \
org.opencontainers.image.version="%%VERSION%%"
RUN set -ex; \ RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \ apk add --no-cache --virtual .fetch-deps \

15
fpm/Dockerfile
View File

@ -5,10 +5,8 @@ LABEL org.opencontainers.image.authors="Alexis Saettler <alexis@saettler.org>" \
org.opencontainers.image.title="MonicaHQ, the Personal Relationship Manager" \ org.opencontainers.image.title="MonicaHQ, the Personal Relationship Manager" \
org.opencontainers.image.description="This is MonicaHQ, your personal memory! MonicaHQ is like a CRM but for the friends, family, and acquaintances around you." \ org.opencontainers.image.description="This is MonicaHQ, your personal memory! MonicaHQ is like a CRM but for the friends, family, and acquaintances around you." \
org.opencontainers.image.url="https://monicahq.com" \ org.opencontainers.image.url="https://monicahq.com" \
org.opencontainers.image.revision="186f336799df2740df28198bfd2431f206668ff2" \
org.opencontainers.image.source="https://github.com/monicahq/docker" \ org.opencontainers.image.source="https://github.com/monicahq/docker" \
org.opencontainers.image.vendor="Monica" \ org.opencontainers.image.vendor="Monica"
org.opencontainers.image.version="v2.18.0"
# entrypoint.sh dependencies # entrypoint.sh dependencies
RUN set -ex; \ RUN set -ex; \
@ -35,7 +33,6 @@ RUN set -ex; \
libfreetype6-dev \ libfreetype6-dev \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libgmp-dev \ libgmp-dev \
libsodium-dev \
libmemcached-dev \ libmemcached-dev \
; \ ; \
\ \
@ -47,23 +44,18 @@ RUN set -ex; \
docker-php-ext-install -j$(nproc) \ docker-php-ext-install -j$(nproc) \
intl \ intl \
zip \ zip \
json \
iconv \
bcmath \ bcmath \
gd \ gd \
gmp \ gmp \
pdo_mysql \ pdo_mysql \
mysqli \ mysqli \
soap \ soap \
sodium \
mbstring \
opcache \
; \ ; \
\ \
# pecl will claim success even if one install fails, so we need to perform each install separately # pecl will claim success even if one install fails, so we need to perform each install separately
pecl install APCu-5.1.18; \ pecl install APCu-5.1.18; \
pecl install memcached-3.1.5; \ pecl install memcached-3.1.5; \
pecl install redis-5.2.2; \ pecl install redis-5.3.0; \
\ \
docker-php-ext-enable \ docker-php-ext-enable \
apcu \ apcu \
@ -99,6 +91,7 @@ ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" \
PHP_OPCACHE_MAX_WASTED_PERCENTAGE="10" PHP_OPCACHE_MAX_WASTED_PERCENTAGE="10"
RUN set -ex; \ RUN set -ex; \
\ \
docker-php-ext-enable opcache; \
{ \ { \
echo '[opcache]'; \ echo '[opcache]'; \
echo 'opcache.enable=1'; \ echo 'opcache.enable=1'; \
@ -121,6 +114,8 @@ WORKDIR /var/www/html
# Define Monica version # Define Monica version
ENV MONICA_VERSION v2.18.0 ENV MONICA_VERSION v2.18.0
LABEL org.opencontainers.image.revision="186f336799df2740df28198bfd2431f206668ff2" \
org.opencontainers.image.version="%%VERSION%%"
RUN set -ex; \ RUN set -ex; \
fetchDeps=" \ fetchDeps=" \