Merge branch 'master' of github.com:jfrazelle/dockerfiles

* 'master' of github.com:jfrazelle/dockerfiles:
  Update usage description of slack & keepass2 (#203)
  CMD => ENTRYPOINT
This commit is contained in:
Jess Frazelle 2016-11-09 11:33:37 -08:00
commit 960b302cc2
No known key found for this signature in database
GPG Key ID: 18F3685C0022BFF3
2 changed files with 10 additions and 5 deletions

View File

@ -9,7 +9,7 @@
# -v /home/$USER/DB.kdbx:/root/DB.kdbx \
# -v /tmp/.X11-unix:/tmp/.X11-unix \
# -e DISPLAY=$DISPLAY \
# keepass2
# keepass2 "$@"
#
# ISSUES:
# # 'Gtk: cannot open display: :0'
@ -28,4 +28,4 @@ RUN apt-get update && apt-get install -y \
--no-install-recommends \
&& rm -rf /var/lib/apt/lists/*
CMD ["/usr/bin/keepass2"]
ENTRYPOINT ["/usr/bin/keepass2"]

View File

@ -4,10 +4,15 @@
# -v /etc/localtime:/etc/localtime:ro \
# -v /tmp/.X11-unix:/tmp/.X11-unix \
# -e DISPLAY=unix$DISPLAY \
# --device /dev/snd:/dev/snd \
# --device /dev/dri:/dev/dri \
# --device /dev/snd \
# --device /dev/dri \
# --device /dev/video0 \
# --group-add audio \
# --group-add video \
# -v "${HOME}/.slack:/root/.config/Slack" \
# --ipc="host" \
# --name slack \
# jess/slack
# jess/slack "$@"
FROM debian:stretch
MAINTAINER Jessie Frazelle <jess@linux.com>