fix volume bug

This commit is contained in:
t3chn0m4g3 2015-08-07 22:32:15 +02:00
parent fb5adfaf51
commit 2c1d7ceae7
9 changed files with 30 additions and 30 deletions

View file

@ -16,17 +16,17 @@ touch /var/run/check.lock
myUPTIME=$(awk '{print int($1/60)}' /proc/uptime) myUPTIME=$(awk '{print int($1/60)}' /proc/uptime)
for i in $myIMAGES for i in $myIMAGES
do do
myCIDSTATUS=$(docker exec $i supervisorctl status) myCIDSTATUS=$(docker exec $i supervisorctl status)
if [ $? -ne 0 ]; if [ $? -ne 0 ];
then then
myCIDSTATUS=1 myCIDSTATUS=1
else else
myCIDSTATUS=$(echo $myCIDSTATUS | egrep -c "(STOPPED|FATAL)") myCIDSTATUS=$(echo $myCIDSTATUS | egrep -c "(STOPPED|FATAL)")
fi fi
if [ $myCIDSTATUS -gt 0 ]; if [ $myCIDSTATUS -gt 0 ];
then then
if [ $myUPTIME -gt 5 ]; if [ $myUPTIME -gt 5 ];
then then
for j in $myIMAGES for j in $myIMAGES
do do
@ -46,7 +46,7 @@ for i in $myIMAGES
fi fi
sleep 0.1 sleep 0.1
done done
docker rm $(docker ps -aq) docker rm -v $(docker ps -aq)
for j in $myIMAGES for j in $myIMAGES
do do
service $j start service $j start

View file

@ -16,9 +16,9 @@ myIMAGES=$(cat /data/images.conf)
touch /var/run/check.lock touch /var/run/check.lock
myUPTIME=$(awk '{print int($1/60)}' /proc/uptime) myUPTIME=$(awk '{print int($1/60)}' /proc/uptime)
if [ $myUPTIME -gt 5 ]; if [ $myUPTIME -gt 5 ];
then then
for i in $myIMAGES for i in $myIMAGES
do do
service $i stop service $i stop
done done
@ -30,13 +30,13 @@ if [ $myUPTIME -gt 5 ];
if [ $? -ne 0 ]; if [ $? -ne 0 ];
then then
echo Docker daemon is still starting. echo Docker daemon is still starting.
else else
echo Docker daemon is now available. echo Docker daemon is now available.
break break
fi fi
sleep 0.1 sleep 0.1
done done
docker rm $(docker ps -aq) docker rm -v $(docker ps -aq)
docker rmi $(docker images | grep "^<none>" | awk '{print $3}') docker rmi $(docker images | grep "^<none>" | awk '{print $3}')
for i in $myIMAGES for i in $myIMAGES
do do

View file

@ -14,11 +14,11 @@ pre-start script
# Remove any existing dionaea containers # Remove any existing dionaea containers
myCID=$(docker ps -a | grep dionaea | awk '{ print $1 }') myCID=$(docker ps -a | grep dionaea | awk '{ print $1 }')
if [ "$myCID" != "" ]; if [ "$myCID" != "" ];
then docker rm $myCID; then docker rm -v $myCID;
fi fi
end script end script
script script
# Delayed start to avoid rapid respawning # Delayed start to avoid rapid respawning
sleep $(((RANDOM % 5)+5)) sleep $(((RANDOM % 5)+5))
/usr/bin/docker run --name dionaea --cap-add=NET_BIND_SERVICE --rm=true -p 21:21 -p 42:42 -p 8080:80 -p 135:135 -p 443:443 -p 445:445 -p 1433:1433 -p 3306:3306 -p 5061:5061 -p 5060:5060 -p 69:69/udp -p 5060:5060/udp -v /data/dionaea dtagdevsec/dionaea /usr/bin/docker run --name dionaea --cap-add=NET_BIND_SERVICE --rm=true -p 21:21 -p 42:42 -p 8080:80 -p 135:135 -p 443:443 -p 445:445 -p 1433:1433 -p 3306:3306 -p 5061:5061 -p 5060:5060 -p 69:69/udp -p 5060:5060/udp -v /data/dionaea dtagdevsec/dionaea
end script end script

View file

@ -14,11 +14,11 @@ pre-start script
# Remove any existing elk containers # Remove any existing elk containers
myCID=$(docker ps -a | grep elk | awk '{ print $1 }') myCID=$(docker ps -a | grep elk | awk '{ print $1 }')
if [ "$myCID" != "" ]; if [ "$myCID" != "" ];
then docker rm $myCID; then docker rm -v $myCID;
fi fi
end script end script
script script
# Delayed start to avoid rapid respawning # Delayed start to avoid rapid respawning
sleep $(((RANDOM % 5)+5)) sleep $(((RANDOM % 5)+5))
/usr/bin/docker run --name=elk --volumes-from ews --volumes-from suricata -v /data/elk/:/data/elk/ -p 127.0.0.1:64296:8080 --rm=true dtagdevsec/elk /usr/bin/docker run --name=elk --volumes-from ews --volumes-from suricata -v /data/elk/:/data/elk/ -p 127.0.0.1:64296:8080 --rm=true dtagdevsec/elk
end script end script

View file

@ -14,11 +14,11 @@ pre-start script
# Remove any existing ews containers # Remove any existing ews containers
myCID=$(docker ps -a | grep ews | awk '{ print $1 }') myCID=$(docker ps -a | grep ews | awk '{ print $1 }')
if [ "$myCID" != "" ]; if [ "$myCID" != "" ];
then docker rm $myCID; then docker rm -v $myCID;
fi fi
end script end script
script script
# Delayed start to avoid rapid respawning # Delayed start to avoid rapid respawning
sleep $(((RANDOM % 5)+5)) sleep $(((RANDOM % 5)+5))
/usr/bin/docker run --name ews --volumes-from dionaea --volumes-from glastopf --volumes-from honeytrap --volumes-from kippo --rm=true -v /data/ews/conf/:/data/ews/conf/ -v /data/ews/ --link kippo:kippo dtagdevsec/ews /usr/bin/docker run --name ews --volumes-from dionaea --volumes-from glastopf --volumes-from honeytrap --volumes-from kippo --rm=true -v /data/ews/conf/:/data/ews/conf/ -v /data/ews/ --link kippo:kippo dtagdevsec/ews
end script end script

View file

@ -14,11 +14,11 @@ pre-start script
# Remove any existing glastopf containers # Remove any existing glastopf containers
myCID=$(docker ps -a | grep glastopf | awk '{ print $1 }') myCID=$(docker ps -a | grep glastopf | awk '{ print $1 }')
if [ "$myCID" != "" ]; if [ "$myCID" != "" ];
then docker rm $myCID; then docker rm -v $myCID;
fi fi
end script end script
script script
# Delayed start to avoid rapid respawning # Delayed start to avoid rapid respawning
sleep $(((RANDOM % 5)+5)) sleep $(((RANDOM % 5)+5))
/usr/bin/docker run --name glastopf --rm=true -p 80:80 -v /data/glastopf dtagdevsec/glastopf /usr/bin/docker run --name glastopf --rm=true -p 80:80 -v /data/glastopf dtagdevsec/glastopf
end script end script

View file

@ -14,13 +14,13 @@ pre-start script
# Remove any existing honeytrap containers # Remove any existing honeytrap containers
myCID=$(docker ps -a | grep honeytrap | awk '{ print $1 }') myCID=$(docker ps -a | grep honeytrap | awk '{ print $1 }')
if [ "$myCID" != "" ]; if [ "$myCID" != "" ];
then docker rm $myCID; then docker rm -v $myCID;
fi fi
/sbin/iptables -w -A INPUT -p tcp --syn -m state --state NEW -m multiport ! --dports 21,22,42,80,135,443,445,1433,3306,5060,5061,64295,64296 -j NFQUEUE /sbin/iptables -w -A INPUT -p tcp --syn -m state --state NEW -m multiport ! --dports 21,22,42,80,135,443,445,1433,3306,5060,5061,64295,64296 -j NFQUEUE
end script end script
script script
# Delayed start to avoid rapid respawning # Delayed start to avoid rapid respawning
sleep $(((RANDOM % 5)+5)) sleep $(((RANDOM % 5)+5))
/usr/bin/docker run --name honeytrap --cap-add=NET_ADMIN --net=host --rm=true -v /data/honeytrap dtagdevsec/honeytrap /usr/bin/docker run --name honeytrap --cap-add=NET_ADMIN --net=host --rm=true -v /data/honeytrap dtagdevsec/honeytrap
end script end script
post-stop script post-stop script

View file

@ -14,11 +14,11 @@ pre-start script
# Remove any existing kippo containers # Remove any existing kippo containers
myCID=$(docker ps -a | grep kippo | awk '{ print $1 }') myCID=$(docker ps -a | grep kippo | awk '{ print $1 }')
if [ "$myCID" != "" ]; if [ "$myCID" != "" ];
then docker rm $myCID; then docker rm -v $myCID;
fi fi
end script end script
script script
# Delayed start to avoid rapid respawning # Delayed start to avoid rapid respawning
sleep $(((RANDOM % 5)+5)) sleep $(((RANDOM % 5)+5))
/usr/bin/docker run --name kippo --rm=true -p 22:2222 -v /data/kippo dtagdevsec/kippo /usr/bin/docker run --name kippo --rm=true -p 22:2222 -v /data/kippo dtagdevsec/kippo
end script end script

View file

@ -14,7 +14,7 @@ pre-start script
# Remove any existing suricata containers # Remove any existing suricata containers
myCID=$(docker ps -a | grep suricata | awk '{ print $1 }') myCID=$(docker ps -a | grep suricata | awk '{ print $1 }')
if [ "$myCID" != "" ]; if [ "$myCID" != "" ];
then docker rm $myCID; then docker rm -v $myCID;
fi fi
myIF=$(route | grep default | awk '{ print $8 }') myIF=$(route | grep default | awk '{ print $8 }')
/sbin/ethtool --offload $myIF rx off tx off /sbin/ethtool --offload $myIF rx off tx off
@ -23,6 +23,6 @@ pre-start script
end script end script
script script
# Delayed start to avoid rapid respawning # Delayed start to avoid rapid respawning
sleep $(((RANDOM % 5)+5)) sleep $(((RANDOM % 5)+5))
/usr/bin/docker run --name suricata --cap-add=NET_ADMIN --net=host --rm=true -v /data/suricata/ dtagdevsec/suricata /usr/bin/docker run --name suricata --cap-add=NET_ADMIN --net=host --rm=true -v /data/suricata/ dtagdevsec/suricata
end script end script