update dockerfile

kdeltared · May 14, 2017 · 42e4304 · 42e4304
1 parent ea16186
commit 42e4304
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 43 deletions.
diff --git a/1.2/Dockerfile b/1.2/Dockerfile
@@ -6,24 +6,24 @@ ENV CUCKOO_VERSION 1.2
 ENV SSDEEP ssdeep-2.13
 
 # Install Cuckoo Sandbox Required Dependencies
-RUN apk-install tcpdump py-lxml py-chardet py-libvirt py-crypto curl
-RUN apk-install -t .build-deps \
-                   openssl-dev \
-                   libxslt-dev \
-                   libxml2-dev \
-                   python-dev \
-                   libffi-dev \
-                   build-base \
-                   libstdc++ \
-                   zlib-dev \
-                   libc-dev \
-                   jpeg-dev \
-                   file-dev \
-                   automake \
-                   autoconf \
-                   libtool \
-                   py-pip \
-                   git \
+RUN apk add --no-cache tcpdump py-lxml py-chardet py-libvirt py-crypto curl
+RUN apk add --no-cache -t .build-deps \
+                           openssl-dev \
+                           libxslt-dev \
+                           libxml2-dev \
+                           python-dev \
+                           libffi-dev \
+                           build-base \
+                           libstdc++ \
+                           zlib-dev \
+                           libc-dev \
+                           jpeg-dev \
+                           file-dev \
+                           automake \
+                           autoconf \
+                           libtool \
+                           py-pip \
+                           git \
   && set -x \
   && echo "===> Install ssdeep..." \
   && wget -O /tmp/$SSDEEP.tar.gz https://downloads.sourceforge.net/project/ssdeep/$SSDEEP/$SSDEEP.tar.gz \

diff --git a/1.2/update_conf.py b/1.2/update_conf.py
@@ -4,20 +4,20 @@
 import sys
 import ConfigParser
 
-cfg = ConfigParser.ConfigParser()
-cfg.read("/cuckoo/conf/reporting.conf")
+reporting_cfg = ConfigParser.ConfigParser()
+cuckoo_cfg = ConfigParser.ConfigParser()
 
+reporting_cfg.read("/cuckoo/conf/reporting.conf")
 with open("/cuckoo/conf/reporting.conf", 'w') as cfile:
     if os.environ.get('MONGO_HOST'):
-        cfg.set('mongodb', 'enabled', True)
-        cfg.set('mongodb', 'hosts', os.environ['MONGO_HOST'])
-    cfg.write(cfile)
-
-cfg.read("/cuckoo/conf/cuckoo.conf")
+        reporting_cfg.set('mongodb', 'enabled', True)
+        reporting_cfg.set('mongodb', 'hosts', os.environ['MONGO_HOST'])
+    reporting_cfg.write(cfile)
 
+cuckoo_cfg.read("/cuckoo/conf/cuckoo.conf")
 with open("/cuckoo/conf/cuckoo.conf", 'w') as cfile:
     if os.environ.get('RESULTSERVER'):
-        cfg.set('resultserver', 'ip', os.environ['RESULTSERVER'])
-    cfg.write(cfile)
+        cuckoo_cfg.set('resultserver', 'ip', os.environ['RESULTSERVER'])
+    cuckoo_cfg.write(cfile)
 
 sys.exit()
diff --git a/2.0/Dockerfile b/2.0/Dockerfile
@@ -10,22 +10,22 @@ ENV SSDEEP ssdeep-2.13
 COPY requirements.txt /tmp/requirements.txt
 RUN apk add --no-cache tcpdump py-lxml py-chardet py-libvirt py-crypto curl
 RUN apk add --no-cache -t .build-deps \
-                   openssl-dev \
-                   libxslt-dev \
-                   libxml2-dev \
-                   python-dev \
-                   libffi-dev \
-                   build-base \
-                   libstdc++ \
-                   zlib-dev \
-                   libc-dev \
-                   jpeg-dev \
-                   file-dev \
-                   automake \
-                   autoconf \
-                   libtool \
-                   py-pip \
-                   git \
+                           openssl-dev \
+                           libxslt-dev \
+                           libxml2-dev \
+                           python-dev \
+                           libffi-dev \
+                           build-base \
+                           libstdc++ \
+                           zlib-dev \
+                           libc-dev \
+                           jpeg-dev \
+                           file-dev \
+                           automake \
+                           autoconf \
+                           libtool \
+                           py-pip \
+                           git \
   && set -x \
   && echo "===> Install ssdeep..." \
   && wget -O /tmp/$SSDEEP.tar.gz https://downloads.sourceforge.net/project/ssdeep/$SSDEEP/$SSDEEP.tar.gz \