Use docker-compose

andrewmichaelsmith · Mar 14, 2015 · b66d6f1 · b66d6f1
1 parent bf3d774
commit b66d6f1
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 32 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -0,0 +1,27 @@
+kippo:
+    image: andrewmichaelsmith/kippo
+    volumes:
+       - var/kippo:/vol/kippo
+    ports:
+       - "22:2222"
+    restart: always
+    working_dir: /vol/kippo
+
+dionaea:
+    image: andrewmichaelsmith/dionaea
+    volumes:
+       - var/dionaea:/vol/dionaea
+    ports:
+       - "21:21"
+       - "42:42"
+       - "80:80"
+       - "135:135"
+       - "443:443"
+       - "445:445"
+       - "1433:1433"
+       - "3306:3306"
+       - "5060:5060"
+       - "5061:5061"
+       - "69:69/udp"
+       - "5060:5060/udp"
+    restart: always
diff --git a/run.sh b/run.sh
@@ -21,37 +21,38 @@ mkdir -p $DIR/var/dionaea/bistreams
 sudo chown $KIPPO_UID $DIR/var/kippo 
 sudo chown -R $DIONAEA_UID $DIR/var/dionaea
 
-
-# Kippo
-docker rm -f kippo
-#docker pull andrewmichaelsmith/kippo
-docker run --restart=always \
-	-v `pwd`/var/kippo:/vol/kippo/ \
-	-w /vol/kippo \
-	-d \
-	-p 22:2222 \
-	--name kippo \
-	andrewmichaelsmith/kippo:latest
-
-# Dionaea
-docker rm -f dionaea
-#docker pull andrewmichaelsmith/dionaea
-docker run --restart=always \
-	-v `pwd`/var/dionaea:/vol/dionaea \
-	-d \
-	--name dionaea \
-	-p 21:21 \
-	-p 42:42 \
-	-p 80:80 \
-	-p 135:135 \
-	-p 443:443 \
-	-p 445:445 \
-	-p 1433:1433 \
-	-p 3306:3306 \
-	-p 5060:5060 \
-	-p 5061:5061 \
-	-p 69:69/udp \
-	-p 5060:5060/udp \
-	andrewmichaelsmith/dionaea:latest
+sudo docker-compose up -d
+
+## Kippo
+#docker rm -f kippo
+##docker pull andrewmichaelsmith/kippo
+#docker run --restart=always \
+#	-v `pwd`/var/kippo:/vol/kippo/ \
+#	-w /vol/kippo \
+#	-d \
+#	-p 22:2222 \
+#	--name kippo \
+#	andrewmichaelsmith/kippo:latest
+#
+## Dionaea
+#docker rm -f dionaea
+##docker pull andrewmichaelsmith/dionaea
+#docker run --restart=always \
+#	-v `pwd`/var/dionaea:/vol/dionaea \
+#	-d \
+#	--name dionaea \
+#	-p 21:21 \
+#	-p 42:42 \
+#	-p 80:80 \
+#	-p 135:135 \
+#	-p 443:443 \
+#	-p 445:445 \
+#	-p 1433:1433 \
+#	-p 3306:3306 \
+#	-p 5060:5060 \
+#	-p 5061:5061 \
+#	-p 69:69/udp \
+#	-p 5060:5060/udp \
+#	andrewmichaelsmith/dionaea:latest
 
 echo "Done, files in `pwd`/var"