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

Merge pull request #159 from shrikeinfosec/fix-wait-for-it.sh 

Fix wait-for-it.sh
Luciano Righetti 2022-09-23 13:49:34 +02:00 committed by GitHub
parent b1b05107a7 9261b912c4
commit 8d55fbc95d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docker-compose.yml
View File

@ -12,7 +12,6 @@ services:
- "80:80" - "80:80"
- "443:443" - "443:443"
volumes: volumes:
- ./web/wait-for-it.sh:/usr/local/bin/wait-for-it.sh:ro
- /dev/urandom:/dev/random - /dev/urandom:/dev/random
- ${DATA_DIR:-./data}/web:/var/www/MISP - ${DATA_DIR:-./data}/web:/var/www/MISP
environment: environment:

3
web/Dockerfile
View File

@ -71,6 +71,9 @@ RUN ( \
# Add run script # Add run script
# Trigger to perform first boot operations # Trigger to perform first boot operations
ADD run.sh /run.sh ADD run.sh /run.sh
# Ensure that wait for it is included in the path and executable
ADD wait-for-it.sh /usr/local/bin/wait-for-it.sh
RUN chmod +x /usr/local/bin/wait-for-it.sh
RUN mv /etc/apache2/sites-available/misp-ssl.conf /etc/apache2/sites-available/misp-ssl.conf.bak RUN mv /etc/apache2/sites-available/misp-ssl.conf /etc/apache2/sites-available/misp-ssl.conf.bak
ADD misp-ssl.conf /etc/apache2/sites-available/misp-ssl.conf ADD misp-ssl.conf /etc/apache2/sites-available/misp-ssl.conf
RUN chmod 0755 /run.sh && touch /.firstboot.tmp RUN chmod 0755 /run.sh && touch /.firstboot.tmp