fix skype, add fontforge, enhance keepass2 (#371)

* Enable keepass2 to use plugins

* Add fontforge

* Let skype finish before exiting container
This commit is contained in:
svenssonaxel 2018-04-10 16:07:13 -04:00 committed by Jess Frazelle
parent 2bf9642576
commit 2f9a86e020
4 changed files with 42 additions and 1 deletions

32
fontforge/Dockerfile Normal file
View File

@ -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 <foss@axelsvensson.com>"
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" ]

View File

@ -8,6 +8,7 @@
# docker run -it \ # docker run -it \
# -v /home/$USER/DB.kdbx:/root/DB.kdbx \ # -v /home/$USER/DB.kdbx:/root/DB.kdbx \
# -v /tmp/.X11-unix:/tmp/.X11-unix \ # -v /tmp/.X11-unix:/tmp/.X11-unix \
# -v /home/$USER/keepass2-plugins:/usr/lib/keepass2/Plugins \
# -e DISPLAY=$DISPLAY \ # -e DISPLAY=$DISPLAY \
# keepass2 "$@" # keepass2 "$@"
# #
@ -25,6 +26,7 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
keepass2 \ keepass2 \
xdotool \ xdotool \
mono-dmcs \
--no-install-recommends \ --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

View File

@ -30,6 +30,8 @@ RUN apt-get update && apt-get -y install \
--no-install-recommends \ --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
COPY run-skype-and-wait-for-exit /usr/local/bin
# Make a user # Make a user
ENV HOME /home/skype ENV HOME /home/skype
RUN useradd --create-home --home-dir $HOME skype \ RUN useradd --create-home --home-dir $HOME skype \
@ -40,4 +42,5 @@ WORKDIR $HOME
USER skype USER skype
# Start Skype # Start Skype
ENTRYPOINT ["skypeforlinux"] ENTRYPOINT ["run-skype-and-wait-for-exit"]

View File

@ -0,0 +1,4 @@
#!/bin/bash
skypeforlinux
sleep 3
while ps -C skypeforlinux >/dev/null;do sleep 3;done