MISP
/
misp-docker
mirror of https://github.com/MISP/misp-docker
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #110 from drcursor/master 

Allow defining the number of parallel workers
pull/1/head
Jason Kendall 2021-04-20 09:00:41 -04:00 committed by GitHub
parent 7d11153c59 a71257a7c2
commit 6d666eedaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -4,10 +4,8 @@ env:
- DOCKER_COMPOSE_VERSION=1.25.3 - DOCKER_COMPOSE_VERSION=1.25.3
before_install: before_install:
- sudo rm /usr/local/bin/docker-compose - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` | sudo tee /usr/local/bin/docker-compose >/dev/null
- curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose - sudo chmod +x /usr/local/bin/docker-compose
- chmod +x docker-compose
- sudo mv docker-compose /usr/local/bin
script: script:
- docker-compose -f docker-compose.yml -f build-docker-compose.yml build - docker-compose -f docker-compose.yml -f build-docker-compose.yml build

1
docker-compose.yml
View File

@ -53,6 +53,7 @@ services:
# - "CERTAUTH=optional" # Can be set to optional or on - Step 2 of https://github.com/MISP/MISP/tree/2.4/app/Plugin/CertAuth is still required # - "CERTAUTH=optional" # Can be set to optional or on - Step 2 of https://github.com/MISP/MISP/tree/2.4/app/Plugin/CertAuth is still required
# - "SECURESSL=true" # Enable higher security SSL in nginx # - "SECURESSL=true" # Enable higher security SSL in nginx
# - "MISP_MODULES_FQDN=http://misp-modules" # Set the MISP Modules FQDN, used for Enrichment_services_url/Import_services_url/Export_services_url # - "MISP_MODULES_FQDN=http://misp-modules" # Set the MISP Modules FQDN, used for Enrichment_services_url/Import_services_url/Export_services_url
# - "WORKERS=1" #If set to a value larger than 1 this will increase the number of parallel worker processes
misp-modules: misp-modules:
image: coolacid/misp-docker:modules-latest image: coolacid/misp-docker:modules-latest
environment: environment:

5
server/files/entrypoint_nginx.sh
View File

@ -50,6 +50,11 @@ init_misp_config(){
/var/www/MISP/app/Console/cake Admin setSetting "Plugin.Export_services_url" "$MISP_MODULES_FQDN" /var/www/MISP/app/Console/cake Admin setSetting "Plugin.Export_services_url" "$MISP_MODULES_FQDN"
/var/www/MISP/app/Console/cake Admin setSetting "Plugin.Cortex_services_enable" false /var/www/MISP/app/Console/cake Admin setSetting "Plugin.Cortex_services_enable" false
echo Change number of workers
if [ ! -z "$WORKERS" ] && [ "$WORKERS" -gt "1" ]; then
sed -i "s/start --interval/start -n $WORKERS --interval/" /var/www/MISP/app/Console/worker/start.sh
fi
} }
init_misp_files(){ init_misp_files(){