diff --git a/docker/compose/mozdef_base/Dockerfile b/docker/compose/mozdef_base/Dockerfile index cc233988..f14d7919 100644 --- a/docker/compose/mozdef_base/Dockerfile +++ b/docker/compose/mozdef_base/Dockerfile @@ -39,8 +39,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 git+https://github.com/andrewkrug/configlib + pip install -r /opt/mozdef/envs/mozdef/requirements.txt + # Local copy for dev COPY mozdef_util /opt/mozdef/envs/mozdef/mozdef_util USER root diff --git a/docker/compose/mozdef_meteor/Dockerfile b/docker/compose/mozdef_meteor/Dockerfile index 90913bac..ea4dde83 100644 --- a/docker/compose/mozdef_meteor/Dockerfile +++ b/docker/compose/mozdef_meteor/Dockerfile @@ -29,23 +29,23 @@ RUN \ RUN \ curl -sL https://rpm.nodesource.com/setup_8.x | bash - && \ yum -y install nodejs -RUN \ - mkdir /opt/mozdef/meteor && \ - curl -sL -o /opt/mozdef/meteor.tar.gz https://static-meteor.netdna-ssl.com/packages-bootstrap/$METEOR_VERSION/meteor-bootstrap-os.linux.x86_64.tar.gz && \ - tar -xzf /opt/mozdef/meteor.tar.gz -C /opt/mozdef/meteor && \ - mv /opt/mozdef/meteor/.meteor /opt/mozdef && \ - rm -r /opt/mozdef/meteor && \ - cp /opt/mozdef/.meteor/packages/meteor-tool/*/mt-os.linux.x86_64/scripts/admin/launch-meteor /usr/bin/meteor + +RUN mkdir /opt/mozdef/meteor +RUN curl -sL -o /opt/mozdef/meteor.tar.gz https://static-meteor.netdna-ssl.com/packages-bootstrap/$METEOR_VERSION/meteor-bootstrap-os.linux.x86_64.tar.gz +RUN tar -xzf /opt/mozdef/meteor.tar.gz -C /opt/mozdef/meteor +RUN mv /opt/mozdef/meteor/.meteor /opt/mozdef +RUN rm -r /opt/mozdef/meteor +RUN cp /opt/mozdef/.meteor/packages/meteor-tool/*/mt-os.linux.x86_64/scripts/admin/launch-meteor /usr/bin/meteor COPY meteor /opt/mozdef/envs/mozdef/meteor COPY docker/compose/mozdef_meteor/files/settings.js /opt/mozdef/envs/mozdef/meteor/app/lib/settings.js RUN chown -R mozdef:mozdef /opt/mozdef/envs/mozdef/meteor USER mozdef -RUN \ - mkdir -p /opt/mozdef/envs/meteor/mozdef +RUN mkdir -p /opt/mozdef/envs/meteor/mozdef + # build meteor runtime if asked, if set to NO, only create the dir created above to mount to do live development -RUN if [ "${METEOR_BUILD}" = "YES" ]; then \ +RUN if [ "${METEOR_BUILD}" = "YES" ]; then \ cd /opt/mozdef/envs/mozdef/meteor && \ meteor npm install && \ meteor build --server localhost:3002 --directory /opt/mozdef/envs/meteor/mozdef && \ @@ -56,4 +56,4 @@ RUN if [ "${METEOR_BUILD}" = "YES" ]; then \ WORKDIR /opt/mozdef/envs/meteor/mozdef -EXPOSE 3000 \ No newline at end of file +EXPOSE 3000 diff --git a/requirements.txt b/requirements.txt index 173f7753..526090e9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -58,3 +58,4 @@ uritemplate==0.6 urllib3==1.22 uwsgi==2.0.17.1 virtualenv==1.11.4 +configlib==2.0.0