mirror of https://github.com/MISP/misp-docker
move php composer dependency into composer-build stage
parent
9977d9281f
commit
c21dabd62c
|
@ -2,7 +2,8 @@ FROM composer:1.9 as composer-build
|
||||||
ARG MISP_TAG
|
ARG MISP_TAG
|
||||||
WORKDIR /tmp
|
WORKDIR /tmp
|
||||||
ADD https://raw.githubusercontent.com/MISP/MISP/${MISP_TAG}/app/composer.json /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
|
FROM debian:buster-slim as php-build
|
||||||
RUN apt-get update; apt-get install -y --no-install-recommends \
|
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
|
# 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
|
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
|
# Entrypoints
|
||||||
COPY files/etc/supervisor/supervisor.conf /etc/supervisor/conf.d/supervisord.conf
|
COPY files/etc/supervisor/supervisor.conf /etc/supervisor/conf.d/supervisord.conf
|
||||||
COPY files/entrypoint_fpm.sh /
|
COPY files/entrypoint_fpm.sh /
|
||||||
|
|
Loading…
Reference in New Issue