Skip to content

Commit

Permalink
Merge pull request #747 from p-l-/fix-docker
Browse files Browse the repository at this point in the history
Docker: add missing configuration files in ivre/base* and ivre/db
  • Loading branch information
p-l- committed Aug 9, 2019
2 parents 58f46be + 75f5005 commit 0d6fe2f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 1 deletion.
2 changes: 2 additions & 0 deletions docker/base-local/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,5 @@ ADD ivre.tar ./
RUN cd ivre/ && \
python setup.py build && python setup.py install && \
cd ../ && rm -rf ivre/

RUN echo 'DB = "mongodb://ivredb/"' > /etc/ivre.conf
2 changes: 2 additions & 0 deletions docker/base-pip/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,5 @@ RUN apt-get -q update
RUN apt-get -qy install python python-dev python-pip && \
pip install ivre && \
apt-get -qy autoremove python-dev python-pip

RUN echo 'DB = "mongodb://ivredb/"' > /etc/ivre.conf
2 changes: 2 additions & 0 deletions docker/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,5 @@ RUN apt-get -qy install python-pymongo python-crypto python-setuptools \
RUN apt-get -qy install git && git clone https://github.com/cea-sec/ivre && \
cd ivre/ && python setup.py build && python setup.py install && \
apt-get -qy --purge autoremove git && cd ../ && rm -rf ivre/

RUN echo 'DB = "mongodb://ivredb/"' > /etc/ivre.conf
2 changes: 1 addition & 1 deletion docker/db/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ VOLUME /var/lib/mongodb
VOLUME /var/log/mongodb

# Accept remote connections to DBs
RUN sed -i 's/^ bindIp:/#bindIp:/' /etc/mongod.conf
RUN sed -i 's/^ bindIp:/ bindIp: 0.0.0.0/' /etc/mongod.conf

# MongoDB instance
EXPOSE 27017
Expand Down

0 comments on commit 0d6fe2f

Please sign in to comment.