Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Merge pull request #300 from amazeeio/hotfix/mongo-broken" #509

Merged
merged 2 commits into from
Jul 31, 2018
Merged

Revert "Merge pull request #300 from amazeeio/hotfix/mongo-broken" #509

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b55c0ef
Revert "Merge pull request #300 from amazeeio/hotfix/mongo-broken"
Jul 17, 2018
7c32066
Merge branch 'master' into undo-mongo-hotfix
rtprio Jul 17, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 20 additions & 23 deletions images/mongo/Dockerfile
View file
Open in desktop
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" ]