Skip to content

Commit

Permalink
fix skype, add fontforge, enhance keepass2 (#371)
Browse files Browse the repository at this point in the history
* Enable keepass2 to use plugins

* Add fontforge

* Let skype finish before exiting container
  • Loading branch information
svenssonaxel authored and jessfraz committed Apr 10, 2018
1 parent 2bf9642 commit 2f9a86e
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 1 deletion.
32 changes: 32 additions & 0 deletions fontforge/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Run Fontforge in a container
#
# state=$HOME
# mkdir -p $state/fontforge
# docker run --rm \
# -v /tmp/.X11-unix:/tmp/.X11-unix \
# -e DISPLAY=unix$DISPLAY \
# -v $state/fontforge:/home/fontforge \
# --name fontforge \
# fghj/fontforge

# Base docker image
FROM ubuntu:latest
LABEL maintainer "Axel Svensson <[email protected]>"

RUN apt-get update \
&& apt-get install -y \
software-properties-common \
--no-install-recommends \
&& add-apt-repository ppa:fontforge/fontforge \
&& apt-get update \
&& apt-get install -y \
fontforge \
--no-install-recommends \
&& rm -rf /var/lib/apt/lists/*

ENV HOME /home/fontforge
RUN useradd --create-home --home-dir $HOME fontforge
WORKDIR $HOME
USER fontforge
CMD [ "fontforge" ]

2 changes: 2 additions & 0 deletions keepass2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
# docker run -it \
# -v /home/$USER/DB.kdbx:/root/DB.kdbx \
# -v /tmp/.X11-unix:/tmp/.X11-unix \
# -v /home/$USER/keepass2-plugins:/usr/lib/keepass2/Plugins \
# -e DISPLAY=$DISPLAY \
# keepass2 "$@"
#
Expand All @@ -25,6 +26,7 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install -y \
keepass2 \
xdotool \
mono-dmcs \
--no-install-recommends \
&& rm -rf /var/lib/apt/lists/*

Expand Down
5 changes: 4 additions & 1 deletion skype/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ RUN apt-get update && apt-get -y install \
--no-install-recommends \
&& rm -rf /var/lib/apt/lists/*

COPY run-skype-and-wait-for-exit /usr/local/bin

# Make a user
ENV HOME /home/skype
RUN useradd --create-home --home-dir $HOME skype \
Expand All @@ -40,4 +42,5 @@ WORKDIR $HOME
USER skype

# Start Skype
ENTRYPOINT ["skypeforlinux"]
ENTRYPOINT ["run-skype-and-wait-for-exit"]

4 changes: 4 additions & 0 deletions skype/run-skype-and-wait-for-exit
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
skypeforlinux
sleep 3
while ps -C skypeforlinux >/dev/null;do sleep 3;done

0 comments on commit 2f9a86e

Please sign in to comment.