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

Merge branch 'MISP:master' into hotfix/build-error-on-m1-mac

Fukusuke Takahashi 2022-08-26 22:38:02 +09:00 committed by GitHub
parent a9fbd035bf b1b05107a7
commit 21bd36aab3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
docker-compose.yml
View File

@ -14,28 +14,32 @@ services:
volumes: volumes:
- ./web/wait-for-it.sh:/usr/local/bin/wait-for-it.sh:ro - ./web/wait-for-it.sh:/usr/local/bin/wait-for-it.sh:ro
- /dev/urandom:/dev/random - /dev/urandom:/dev/random
- ${DATA_DIR}/web:/var/www/MISP - ${DATA_DIR:-./data}/web:/var/www/MISP
environment: environment:
- MYSQL_HOST=${MYSQL_HOST} - MYSQL_HOST=${MYSQL_HOST:-misp_db}
- MYSQL_DATABASE=${MYSQL_DATABASE} - MYSQL_DATABASE=${MYSQL_DATABASE:-misp}
- MYSQL_USER=${MYSQL_USER} - MYSQL_USER=${MYSQL_USER:-misp}
- MYSQL_PASSWORD=${MYSQL_PASSWORD} - MYSQL_PASSWORD=${MYSQL_PASSWORD:-misp}
- MISP_ADMIN_EMAIL=${MISP_ADMIN_EMAIL} - MISP_ADMIN_EMAIL=${MISP_ADMIN_EMAIL:-admin@admin.test}
- MISP_ADMIN_PASSPHRASE=${MISP_ADMIN_PASSPHRASE} - MISP_ADMIN_PASSPHRASE=${MISP_ADMIN_PASSPHRASE:-admin}
- MISP_BASEURL=${MISP_BASEURL} - MISP_BASEURL=${MISP_BASEURL:-https://localhost}
- POSTFIX_RELAY_HOST=${POSTFIX_RELAY_HOST} - POSTFIX_RELAY_HOST=${POSTFIX_RELAY_HOST:-relay.fqdn}
- TIMEZONE=${TIMEZONE} - TIMEZONE=${TIMEZONE:-UTC}
entrypoint: "wait-for-it.sh -t 0 -h ${MYSQL_HOST} -p 3306 -- /run.sh" entrypoint: "wait-for-it.sh -t 0 -h ${MYSQL_HOST:-misp_db} -p 3306 -- /run.sh"
db: db:
container_name: misp_db container_name: misp_db
image: mysql/mysql-server:5.7 image: mysql/mysql-server:5.7
hostname: ${MYSQL_HOST} hostname: ${MYSQL_HOST:-misp_db}
restart: unless-stopped restart: unless-stopped
volumes: volumes:
- ${DATA_DIR}/db:/var/lib/mysql - ${DATA_DIR:-./data}/db:/var/lib/mysql
environment: environment:
- MYSQL_DATABASE=${MYSQL_DATABASE} - MYSQL_DATABASE=${MYSQL_DATABASE:-misp}
- MYSQL_USER=${MYSQL_USER} - MYSQL_USER=${MYSQL_USER:-misp}
- MYSQL_PASSWORD=${MYSQL_PASSWORD} - MYSQL_PASSWORD=${MYSQL_PASSWORD:-misp}
- MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-misp}
volumes:
web:
db:

2
web/Dockerfile
View File

@ -59,11 +59,13 @@ RUN ( \
echo 'command=/bin/bash /var/www/MISP/app/Console/worker/start.sh'; \ echo 'command=/bin/bash /var/www/MISP/app/Console/worker/start.sh'; \
echo 'startsecs = 0'; \ echo 'startsecs = 0'; \
echo 'autorestart = false'; \ echo 'autorestart = false'; \
echo 'user=www-data'; \
echo ''; \ echo ''; \
echo '[program:misp-modules]'; \ echo '[program:misp-modules]'; \
echo 'command=/bin/bash -c "/var/www/MISP/venv/bin/misp-modules -l 127.0.0.1 -s"'; \ echo 'command=/bin/bash -c "/var/www/MISP/venv/bin/misp-modules -l 127.0.0.1 -s"'; \
echo 'startsecs = 0'; \ echo 'startsecs = 0'; \
echo 'autorestart = false'; \ echo 'autorestart = false'; \
echo 'user=www-data'; \
) >> /etc/supervisor/conf.d/supervisord.conf ) >> /etc/supervisor/conf.d/supervisord.conf
# Add run script # Add run script