From c21dabd62cbdda382d79b68208a4a6dcb8a21526 Mon Sep 17 00:00:00 2001 From: Garrit Schroeder Date: Mon, 15 Mar 2021 18:11:40 +0100 Subject: [PATCH] move php composer dependency into composer-build stage --- server/Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/server/Dockerfile b/server/Dockerfile index f69b53f..48fa6a8 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -2,7 +2,8 @@ FROM composer:1.9 as composer-build ARG MISP_TAG WORKDIR /tmp ADD https://raw.githubusercontent.com/MISP/MISP/${MISP_TAG}/app/composer.json /tmp - RUN composer install --ignore-platform-reqs + RUN composer install --ignore-platform-reqs && \ + composer require jumbojett/openid-connect-php --ignore-platform-reqs FROM debian:buster-slim as php-build RUN apt-get update; apt-get install -y --no-install-recommends \ @@ -154,9 +155,6 @@ ARG PHP_VER # Make a copy of the configurations, so we can sync from it RUN cp -R /var/www/MISP/app/Config /var/www/MISP/app/Config.dist - # Intall Open ID Connect dependency - RUN cd /var/www/MISP/app && php composer.phar require jumbojett/openid-connect-php - # Entrypoints COPY files/etc/supervisor/supervisor.conf /etc/supervisor/conf.d/supervisord.conf COPY files/entrypoint_fpm.sh /