Skip to content

Commit

Permalink
Revert "Merge pull request #300 from amazeeio/hotfix/mongo-broken"
Browse files Browse the repository at this point in the history
Mongodb builds again.

This reverts commit 086c1f1, reversing
changes made to 05456c5.
  • Loading branch information
Elliot Schlegelmilch committed Jul 17, 2018
1 parent 68375fa commit b55c0ef
Showing 1 changed file with 20 additions and 23 deletions.
43 changes: 20 additions & 23 deletions images/mongo/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,30 +1,27 @@
FROM amazeeio/mongo
# commented as long as https://github.com/amazeeio/lagoon/issues/296 is not fixed
# ARG IMAGE_REPO
# FROM ${IMAGE_REPO:-lagoon}/commons as commons
# FROM alpine:edge
ARG IMAGE_REPO
FROM ${IMAGE_REPO:-lagoon}/commons as commons
FROM alpine:edge

# MAINTAINER amazee.io
# ENV LAGOON=mongo
MAINTAINER amazee.io
ENV LAGOON=mongo

# # Copying commons files
# COPY --from=commons /lagoon /lagoon
# COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/
# COPY --from=commons /sbin/tini /sbin/
# COPY --from=commons /home /home

# # When Bash is invoked via `sh` it behaves like the old Bourne Shell and sources a file that is given in `ENV`
# # When Bash is invoked as non-interactive (like `bash -c command`) it sources a file that is given in `BASH_ENV`
# ENV TMPDIR=/tmp TMP=/tmp HOME=/home ENV=/home/.bashrc BASH_ENV=/home/.bashrc
COPY --from=commons /lagoon /lagoon
COPY --from=commons /bin/fix-permissions /bin/ep /bin/docker-sleep /bin/
COPY --from=commons /home /home

# RUN apk --no-cache add mongodb
# When Bash is invoked via `sh` it behaves like the old Bourne Shell and sources a file that is given in `ENV`
# When Bash is invoked as non-interactive (like `bash -c command`) it sources a file that is given in `BASH_ENV`
ENV TMPDIR=/tmp TMP=/tmp HOME=/home ENV=/home/.bashrc BASH_ENV=/home/.bashrc

# RUN mkdir -p /data/db /data/configdb && \
# fix-permissions /data/db && \
# fix-permissions /data/configdb
RUN apk --no-cache add mongodb

# VOLUME /data/db
# EXPOSE 27017 28017
RUN mkdir -p /data/db /data/configdb && \
fix-permissions /data/db && \
fix-permissions /data/configdb

# ENTRYPOINT ["/sbin/tini", "--", "/lagoon/entrypoints.sh"]
# CMD [ "mongod", "--bind_ip", "0.0.0.0" ]
VOLUME /data/db
EXPOSE 27017 28017

ENTRYPOINT ["/lagoon/entrypoints.sh"]
CMD [ "mongod", "--bind_ip", "0.0.0.0" ]

0 comments on commit b55c0ef

Please sign in to comment.