Resolved merge conflict

Makefile

@@ -28,7 +28,7 @@ run-only:
 
 .PHONY: run-cloudy-mozdef
 run-cloudy-mozdef: ## Run the MozDef containers necessary to run in AWS (`cloudy-mozdef`). This is used by the CloudFormation-initiated setup.
-	docker-compose -f  -f $(USE_DKR_IMAGES) -f docker/compose/docker-compose-cloudy-mozdef.yml -p $(NAME) up -d
+	docker-compose -f docker/compose/docker-compose-cloudy-mozdef.yml -p $(NAME) up -d
 
 # TODO? add custom test targets for individual tests (what used to be `multiple-tests` for example
 # The docker files are still in docker/compose/docker*test*

cloudy_mozdef/cloudformation/mozdef-instance.yml

@@ -100,7 +100,8 @@ Resources:
             path: /opt/mozdef/docker/compose/cloudy_mozdef.env
           runcmd:
             - chmod 600 /opt/mozdef/docker/compose/cloudy_mozdef.env
-            - make -C /opt/mozdef -f /opt/mozdef/Makefile  # run-cloudy-mozdef
+            - cd /opt/mozdef && git pull infosec_workweek
+            - make -C /opt/mozdef -f /opt/mozdef/Makefile  # USE_DKR_IMAGES=docker/compose/docker-compose-norebuild.yml run-cloudy-mozdef
   MozDefAutoScaleGroup:
     Type: AWS::AutoScaling::AutoScalingGroup
     Properties:

cloudy_mozdef/packer/packer.json

@@ -26,6 +26,7 @@
         "sudo yum install -y git",
         "sudo yum install -y docker",
         "sudo pip install virtualenv ",
+        "sudo pip install docker-compose",
         "sudo systemctl enable docker",
         "sudo mkdir -p /opt/mozdef/",
         "sudo git clone https://github.com/mozilla/MozDef /opt/mozdef",

docker/compose/docker-compose-cloudy-mozdef.yml

@@ -2,9 +2,7 @@
 version: '2.2'
 services:
   nginx:
-    build:
+    image: mozdef/mozdef_nginx
-      context: ../../
-      dockerfile: docker/compose/nginx/Dockerfile
     restart: always
     command: /usr/sbin/nginx
     depends_on:
@@ -17,9 +15,7 @@ services:
     networks:
       - default
   mongodb:
-    build:
+    image: mozdef/mozdef_mongodb
-      context: ../../
-      dockerfile: docker/compose/mongodb/Dockerfile
     restart: always
     command: /usr/bin/mongod --smallfiles --config /etc/mongod.conf
     volumes:
@@ -27,9 +23,7 @@ services:
     networks:
       - default
   bootstrap:
-    build:
+    image: mozdef/mozdef_bootstrap
-      context: ../../
-      dockerfile: docker/compose/mozdef_bootstrap/Dockerfile
     env_file:
       - cloudy_mozdef.env
     command: bash -c 'source /opt/mozdef/envs/python/bin/activate && python docker/conf/initial_setup.py ${ES_URL} cron/defaultMappingTemplate.json cron/backup.conf'
@@ -39,18 +33,14 @@ services:
       - default
   # MozDef Specific Containers
   base:
-    build:
+    image: mozdef/mozdef_base
-      context: ../../
-      dockerfile: docker/compose/mozdef_base/Dockerfile
     env_file:
       - cloudy_mozdef.env
     command: bash -c 'su - mozdef -c /opt/mozdef/envs/mozdef/cron/update_geolite_db.sh'
     volumes:
       - geolite_db:/opt/mozdef/envs/mozdef/data
   alertplugins:
-    build:
+    image: mozdef/mozdef_alertplugins
-      context: ../../
-      dockerfile: docker/compose/mozdef_alertplugins/Dockerfile
     env_file:
       - cloudy_mozdef.env
     restart: always
@@ -62,9 +52,7 @@ services:
     networks:
       - default
   alerts:
-    build:
+    image: mozdef/mozdef_alerts
-      context: ../../
-      dockerfile: docker/compose/mozdef_alerts/Dockerfile
     env_file:
       - cloudy_mozdef.env
     restart: always
@@ -75,9 +63,7 @@ services:
     networks:
       - default
   cron:
-    build:
+    image: mozdef/mozdef_cron
-      context: ../../
-      dockerfile: docker/compose/mozdef_cron/Dockerfile
     env_file:
       - cloudy_mozdef.env
     restart: always
@@ -91,9 +77,7 @@ services:
     networks:
       - default
   loginput:
-    build:
+    image: mozdef/mozdef_loginput
-      context: ../../
-      dockerfile: docker/compose/mozdef_loginput/Dockerfile
     env_file:
       - cloudy_mozdef.env
     restart: always
@@ -104,9 +88,7 @@ services:
     networks:
       - default
   meteor:
-    build:
+    image: mozdef/mozdef_meteor
-      context: ../../
-      dockerfile: docker/compose/mozdef_meteor/Dockerfile
     restart: always
     command: bash -c 'node bundle/main.js'
     depends_on:
@@ -116,9 +98,7 @@ services:
     networks:
       - default
   rest:
-    build:
+    image: mozdef/mozdef_rest
-      context: ../../
-      dockerfile: docker/compose/mozdef_rest/Dockerfile
     env_file:
       - cloudy_mozdef.env
     restart: always
@@ -130,9 +110,7 @@ services:
     networks:
       - default
   syslog:
-    build:
+    image: mozdef/mozdef_syslog
-      context: ../../
-      dockerfile: docker/compose/mozdef_syslog/Dockerfile
     env_file:
       - cloudy_mozdef.env
     restart: always

docker/compose/mozdef_base/Dockerfile

@@ -40,7 +40,8 @@ USER mozdef
 RUN \
   virtualenv /opt/mozdef/envs/python && \
   source /opt/mozdef/envs/python/bin/activate && \
-  pip install -r /opt/mozdef/envs/mozdef/requirements.txt
+  pip install -r /opt/mozdef/envs/mozdef/requirements.txt && \
+  pip install git+https://github.com/andrewkrug/configlib
 
 # Local copy for dev
 COPY mozdef_util /opt/mozdef/envs/mozdef/mozdef_util