docker/glpi
1
0
Fork 0
Code Issues 2 Pull Requests Actions Projects Releases 9 Wiki Activity

refactor(docker): dockerfile move php version to arg

Browse Source 
!4 #3
This commit is contained in:
Jon Lockwood
2023-08-30 11:22:23 +09:30
parent e1d47023f9
commit 1973f5e003
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
dockerfile
View File

@ -1,11 +1,13 @@
ARG GLPI_VERSION=10.0.9 ARG GLPI_VERSION=10.0.9
ARG VERSION_PHP=7.4
FROM debian:bullseye-slim as prepare FROM debian:bullseye-slim as prepare
ARG GLPI_VERSION ARG GLPI_VERSION
ARG VERSION_PHP
ENV GLPI_VERSION $GLPI_VERSION ENV GLPI_VERSION $GLPI_VERSION
ENV VERSION_PHP $VERSION_PHP
# RUN echo "Acquire::http::Proxy \"http://192.168.1.172:3142\";\nAcquire::https::Proxy \"http://192.168.1.172:3142\";" > /etc/apt/apt.conf.d/apt_proxy.conf # RUN echo "Acquire::http::Proxy \"http://192.168.1.172:3142\";\nAcquire::https::Proxy \"http://192.168.1.172:3142\";" > /etc/apt/apt.conf.d/apt_proxy.conf
@ -35,13 +37,15 @@ FROM debian:bullseye-slim
ARG GLPI_VERSION ARG GLPI_VERSION
ARG VERSION_PHP
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ENV GLPI_VERSION $GLPI_VERSION ENV GLPI_VERSION $GLPI_VERSION
ENV VERSION_PHP $VERSION_PHP
#COPY --from=prepare /etc/apt/apt.conf.d/apt_proxy.conf /etc/apt/apt.conf.d/apt_proxy.conf #COPY --from=prepare /etc/apt/apt.conf.d/apt_proxy.conf /etc/apt/apt.conf.d/apt_proxy.conf
COPY --from=prepare /usr/share/keyrings/deb.sury.org-php.gpg /usr/share/keyrings/deb.sury.org-php.gpg COPY --from=prepare /usr/share/keyrings/deb.sury.org-php.gpg /usr/share/keyrings/deb.sury.org-php.gpg
@ -52,20 +56,20 @@ COPY --from=prepare /etc/apt/sources.list.d/php.list /etc/apt/sources.list.d/php
RUN apt update; \ RUN apt update; \
apt install --no-install-recommends -y \ apt install --no-install-recommends -y \
apache2 \ apache2 \
php7.4 \ php$VERSION_PHP \
php7.4-mysql \ php$VERSION_PHP-mysql \
php7.4-ldap \ php$VERSION_PHP-ldap \
php7.4-xmlrpc \ php$VERSION_PHP-xmlrpc \
php7.4-imap \ php$VERSION_PHP-imap \
php7.4-curl \ php$VERSION_PHP-curl \
php7.4-gd \ php$VERSION_PHP-gd \
php7.4-mbstring \ php$VERSION_PHP-mbstring \
php7.4-xml \ php$VERSION_PHP-xml \
php-cas \ php-cas \
php7.4-intl \ php$VERSION_PHP-intl \
php7.4-zip \ php$VERSION_PHP-zip \
php7.4-bz2 \ php$VERSION_PHP-bz2 \
php7.4-redis \ php$VERSION_PHP-redis \
\ \
cron \ cron \
supervisor \ supervisor \