Skip to content

Commit

Permalink
entry point!
Browse files Browse the repository at this point in the history
  • Loading branch information
sergio-fry committed Dec 28, 2017
1 parent 0123908 commit cc796cb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
5 changes: 4 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ RUN git clone https://gitlab.com/Kanedias/MARC-FS.git /usr/local/src/marc-fs &&
mv /usr/local/src/marc-fs/build/marcfs /usr/local/bin/

COPY docker-entrypoint.sh /usr/local/bin/
ENTRYPOINT docker-entrypoint.sh
RUN chmod +x /usr/local/bin/docker-entrypoint.sh

RUN adduser --system app
USER app
Expand All @@ -22,3 +22,6 @@ RUN mkdir /tmp/cache

ENV [email protected]
ENV [email protected]

ENTRYPOINT ["docker-entrypoint.sh"]
CMD ["bash"]
3 changes: 0 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
sender:
build: .
privileged: true

env_file: .env

command: "marcfs /tmp/mailru -o username=$MAILRU_LOGIN,password=$MAILRU_PASSWORD,cachedir=/tmp/cache"
1 change: 1 addition & 0 deletions docker-entrypoint.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash
set -e

echo "Mounting Mail.ru Cloud..."
marcfs /tmp/mailru -o username=$MAILRU_LOGIN,password=$MAILRU_PASSWORD,cachedir=/tmp/cache

exec "$@"

0 comments on commit cc796cb

Please sign in to comment.