mirror of https://github.com/MISP/misp-docker
Compare commits
3 Commits
b8d722a86b
...
a20eece2d5
Author | SHA1 | Date |
---|---|---|
ftoppi | a20eece2d5 | |
Stefano Ortolani | 66a683c075 | |
Christian Morales Guerrero | 313681a344 |
|
@ -103,6 +103,7 @@ set_up_oidc() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check required variables
|
# Check required variables
|
||||||
|
# OIDC_ISSUER may be empty
|
||||||
check_env_vars OIDC_PROVIDER_URL OIDC_CLIENT_ID OIDC_CLIENT_SECRET OIDC_ROLES_PROPERTY OIDC_ROLES_MAPPING OIDC_DEFAULT_ORG
|
check_env_vars OIDC_PROVIDER_URL OIDC_CLIENT_ID OIDC_CLIENT_SECRET OIDC_ROLES_PROPERTY OIDC_ROLES_MAPPING OIDC_DEFAULT_ORG
|
||||||
|
|
||||||
sudo -u www-data php /var/www/MISP/tests/modify_config.php modify "{
|
sudo -u www-data php /var/www/MISP/tests/modify_config.php modify "{
|
||||||
|
@ -114,6 +115,7 @@ set_up_oidc() {
|
||||||
sudo -u www-data php /var/www/MISP/tests/modify_config.php modify "{
|
sudo -u www-data php /var/www/MISP/tests/modify_config.php modify "{
|
||||||
\"OidcAuth\": {
|
\"OidcAuth\": {
|
||||||
\"provider_url\": \"${OIDC_PROVIDER_URL}\",
|
\"provider_url\": \"${OIDC_PROVIDER_URL}\",
|
||||||
|
${OIDC_ISSUER:+\"issuer\": \"${OIDC_ISSUER}\",}
|
||||||
\"client_id\": \"${OIDC_CLIENT_ID}\",
|
\"client_id\": \"${OIDC_CLIENT_ID}\",
|
||||||
\"client_secret\": \"${OIDC_CLIENT_SECRET}\",
|
\"client_secret\": \"${OIDC_CLIENT_SECRET}\",
|
||||||
\"roles_property\": \"${OIDC_ROLES_PROPERTY}\",
|
\"roles_property\": \"${OIDC_ROLES_PROPERTY}\",
|
||||||
|
|
|
@ -13,6 +13,12 @@ services:
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: valkey/valkey:7.2
|
image: valkey/valkey:7.2
|
||||||
|
healthcheck:
|
||||||
|
test: valkey-cli ping || exit 1
|
||||||
|
interval: 2s
|
||||||
|
timeout: 1s
|
||||||
|
retries: 3
|
||||||
|
start_period: 30s
|
||||||
|
|
||||||
db:
|
db:
|
||||||
# We use MariaDB because it supports ARM and has the expected collations
|
# We use MariaDB because it supports ARM and has the expected collations
|
||||||
|
@ -27,6 +33,12 @@ services:
|
||||||
- mysql_data:/var/lib/mysql
|
- mysql_data:/var/lib/mysql
|
||||||
cap_add:
|
cap_add:
|
||||||
- SYS_NICE # CAP_SYS_NICE Prevent runaway mysql log
|
- SYS_NICE # CAP_SYS_NICE Prevent runaway mysql log
|
||||||
|
healthcheck:
|
||||||
|
test: mysqladmin --user=$$MYSQL_USER --password=$$MYSQL_PASSWORD status
|
||||||
|
interval: 2s
|
||||||
|
timeout: 1s
|
||||||
|
retries: 3
|
||||||
|
start_period: 30s
|
||||||
|
|
||||||
misp-core:
|
misp-core:
|
||||||
image: ghcr.io/misp/misp-docker/misp-core:latest
|
image: ghcr.io/misp/misp-docker/misp-core:latest
|
||||||
|
@ -46,8 +58,16 @@ services:
|
||||||
- PYPI_CYBOX_VERSION=${PYPI_CYBOX_VERSION}
|
- PYPI_CYBOX_VERSION=${PYPI_CYBOX_VERSION}
|
||||||
- PYPI_PYMISP_VERSION=${PYPI_PYMISP_VERSION}
|
- PYPI_PYMISP_VERSION=${PYPI_PYMISP_VERSION}
|
||||||
depends_on:
|
depends_on:
|
||||||
- redis
|
redis:
|
||||||
- db
|
condition: service_healthy
|
||||||
|
db:
|
||||||
|
condition: service_healthy
|
||||||
|
healthcheck:
|
||||||
|
test: curl -ks https://localhost/users/login > /dev/null || exit 1
|
||||||
|
interval: 2s
|
||||||
|
timeout: 1s
|
||||||
|
retries: 3
|
||||||
|
start_period: 30s
|
||||||
ports:
|
ports:
|
||||||
- "80:80"
|
- "80:80"
|
||||||
- "443:443"
|
- "443:443"
|
||||||
|
@ -138,7 +158,8 @@ services:
|
||||||
environment:
|
environment:
|
||||||
- "REDIS_BACKEND=redis"
|
- "REDIS_BACKEND=redis"
|
||||||
depends_on:
|
depends_on:
|
||||||
- redis
|
redis:
|
||||||
|
condition: service_healthy
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
mysql_data:
|
mysql_data:
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
# Build-time variables
|
# Build-time variables
|
||||||
##
|
##
|
||||||
|
|
||||||
CORE_TAG=v2.4.190
|
CORE_TAG=v2.4.191
|
||||||
MODULES_TAG=v2.4.188
|
MODULES_TAG=v2.4.188
|
||||||
PHP_VER=20190902
|
PHP_VER=20190902
|
||||||
LIBFAUP_COMMIT=3a26d0a
|
LIBFAUP_COMMIT=3a26d0a
|
||||||
|
|
Loading…
Reference in New Issue