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

fix(dockerfile): ensure CA certs available prior to apt install

Browse Source 
!4
This commit is contained in:
Jon Lockwood
2023-08-30 11:56:25 +09:30
parent 5884c49f8a
commit 688517556a
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
dockerfile
View File

@ -47,12 +47,20 @@ ENV GLPI_VERSION $GLPI_VERSION
ENV VERSION_PHP $VERSION_PHP 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
COPY --from=prepare /etc/apt/sources.list.d/php.list /etc/apt/sources.list.d/php.list COPY --from=prepare /etc/apt/sources.list.d/php.list /etc/apt/sources.list.d/php.list
RUN apt update; \
apt install --no-install-recommends -y \
ca-certificates \
\
cron \
supervisor; \
rm -rf /var/lib/apt/lists/*;
RUN apt update; \ RUN apt update; \
apt install --no-install-recommends -y \ apt install --no-install-recommends -y \
apache2 \ apache2 \
@ -69,15 +77,11 @@ RUN apt update; \
php$VERSION_PHP-intl \ php$VERSION_PHP-intl \
php$VERSION_PHP-zip \ php$VERSION_PHP-zip \
php$VERSION_PHP-bz2 \ php$VERSION_PHP-bz2 \
php$VERSION_PHP-redis \ php$VERSION_PHP-redis; \
\ rm -rf /var/lib/apt/lists/*; \
cron \ rm -rf /var/www/html; \
supervisor \ rm -f /etc/apt/apt.conf.d/apt_proxy.conf; \
ca-certificates; \ a2enmod rewrite;
rm -rf /var/lib/apt/lists/*; \
rm -rf /var/www/html; \
rm -f /etc/apt/apt.conf.d/apt_proxy.conf; \
a2enmod rewrite;
COPY --from=prepare /tmp/glpi /var/www/html COPY --from=prepare /tmp/glpi /var/www/html