Merge pull request #103 from garrit-schroeder/oidc2

Install dependencies for Open ID Connect implementation for MISP v2.4.140
pull/1/head
Jason Kendall 2021-04-21 10:50:07 -04:00 committed by GitHub
commit f987fe180f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions

View File

@ -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 \
@ -108,6 +109,7 @@ ARG PHP_VER
python3-pip \ python3-pip \
# PHP Requirements # PHP Requirements
php \ php \
php-curl \
php-xml \ php-xml \
php-intl \ php-intl \
php-bcmath \ php-bcmath \

View File

@ -40,7 +40,7 @@ server {
fastcgi_hide_header X-Powered-By; fastcgi_hide_header X-Powered-By;
location / { location / {
try_files $uri $uri/ /index.php; try_files $uri $uri/ /index.php$is_args$query_string;
} }
location ~ \.php$ { location ~ \.php$ {

View File

@ -38,7 +38,7 @@ server {
fastcgi_hide_header X-Powered-By; fastcgi_hide_header X-Powered-By;
location / { location / {
try_files $uri $uri/ /index.php; try_files $uri $uri/ /index.php$is_args$query_string;
} }
location ~ \.php$ { location ~ \.php$ {

View File

@ -24,7 +24,7 @@ server {
fastcgi_hide_header X-Powered-By; fastcgi_hide_header X-Powered-By;
location / { location / {
try_files $uri $uri/ /index.php; try_files $uri $uri/ /index.php$is_args$query_string;
} }
location ~ \.php$ { location ~ \.php$ {