fix for userns;

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
This commit is contained in:
Jessica Frazelle 2016-01-08 18:57:39 -08:00
parent f37a7df986
commit 36028b7bc4
No known key found for this signature in database
GPG Key ID: 18F3685C0022BFF3
2 changed files with 13 additions and 4 deletions

View File

@ -43,8 +43,8 @@ RUN buildDeps=' \
&& set -x \ && set -x \
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* \ && rm -rf /var/lib/apt/lists/* \
&& curl -sSL "http://www.irssi.org/files/irssi-${IRSSI_VERSION}.tar.bz2" -o /tmp/irssi.tar.bz2 \ && curl -fsSL "https://github.com/irssi-import/irssi/releases/download/${IRSSI_VERSION}/irssi-${IRSSI_VERSION}.tar.bz2" -o /tmp/irssi.tar.bz2 \
&& curl -sSL "http://www.irssi.org/files/irssi-${IRSSI_VERSION}.tar.bz2.sig" -o /tmp/irssi.tar.bz2.sig \ && curl -fsSL "https://github.com/irssi-import/irssi/releases/download/${IRSSI_VERSION}/irssi-${IRSSI_VERSION}.tar.bz2.sig" -o /tmp/irssi.tar.bz2.sig \
&& gpg --verify /tmp/irssi.tar.bz2.sig \ && gpg --verify /tmp/irssi.tar.bz2.sig \
&& mkdir -p /usr/src/irssi \ && mkdir -p /usr/src/irssi \
&& tar -xjf /tmp/irssi.tar.bz2 -C /usr/src/irssi --strip-components 1 \ && tar -xjf /tmp/irssi.tar.bz2 -C /usr/src/irssi --strip-components 1 \
@ -81,7 +81,6 @@ RUN buildDeps=' \
&& apt-get purge -y --auto-remove $buildDeps && apt-get purge -y --auto-remove $buildDeps
WORKDIR $HOME WORKDIR $HOME
VOLUME $HOME/.irssi
USER user USER user
CMD ["irssi"] CMD ["irssi"]

View File

@ -23,6 +23,7 @@ MAINTAINER Jessie Frazelle <jess@linux.com>
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
at-spi2-core \ at-spi2-core \
dbus \ dbus \
dbus-x11 \
libgl1-mesa-dri \ libgl1-mesa-dri \
libgl1-mesa-glx \ libgl1-mesa-glx \
libnotify-bin \ libnotify-bin \
@ -30,6 +31,15 @@ RUN apt-get update && apt-get install -y \
--no-install-recommends \ --no-install-recommends \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
ENV HOME /home/user
RUN useradd --create-home --home-dir $HOME user \
&& mkdir -p $HOME/.cache/dconf \
&& mkdir -p $HOME/.dbus \
&& chown -R user:user $HOME
COPY org.freedesktop.Notifications.service /usr/share/dbus-1/services/org.freedesktop.Notifications.service COPY org.freedesktop.Notifications.service /usr/share/dbus-1/services/org.freedesktop.Notifications.service
WORKDIR $HOME
USER user
ENTRYPOINT ["/usr/lib/x86_64-linux-gnu/notify-osd"] ENTRYPOINT ["/usr/lib/x86_64-linux-gnu/notify-osd"]