drop grsec support and make sure hipchat writes its configs

This commit is contained in:
Andy 2018-03-05 11:55:17 +01:00
parent 37b4590428
commit 1297568508
2 changed files with 6 additions and 19 deletions

View File

@ -4,27 +4,20 @@ MAINTAINER Andrey Arapov <andrey.arapov@nixaid.com>
# To avoid problems with Dialog and curses wizards # To avoid problems with Dialog and curses wizards
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ADD https://atlassian.artifactoryonline.com/atlassian/api/gpg/key/public /tmp/public
RUN apt-get update && \ RUN apt-get update && \
apt-get -y --no-install-recommends install ca-certificates apt-transport-https wget attr && \ apt-get -y --no-install-recommends install ca-certificates apt-transport-https && \
wget -O - https://atlassian.artifactoryonline.com/atlassian/api/gpg/key/public | apt-key add - && \ cat /tmp/public | apt-key add - && \
echo "deb https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client xenial main" > /etc/apt/sources.list.d/atlassian-hipchat4.list && \ echo "deb https://atlassian.artifactoryonline.com/atlassian/hipchat-apt-client xenial main" > /etc/apt/sources.list.d/atlassian-hipchat4.list && \
apt-get update && \ apt-get update && \
apt-get -y --no-install-recommends install hipchat4 libqt5gui5 && \ apt-get -y --no-install-recommends install hipchat4 libqt5gui5 && \
apt-get -fy --no-install-recommends install && \ apt-get -fy --no-install-recommends install && \
rm -rf -- /var/lib/apt/lists/* rm -rf -- /var/lib/apt/lists/*
# Make HipChat grsec friendly
#
# To build the Docker image, I currently had to disable the following grsec protections:
# # grep -E "chroot_deny_chmod|chroot_deny_mknod|chroot_caps" /etc/sysctl.d/grsec.conf
# kernel.grsecurity.chroot_deny_chmod = 0
# kernel.grsecurity.chroot_deny_mknod = 0
# kernel.grsecurity.chroot_caps = 0 (relates to a systemd package)
RUN useradd -u 1000 -m -d /home/user -s /usr/sbin/nologin -g video user RUN useradd -u 1000 -m -d /home/user -s /usr/sbin/nologin -g video user
COPY launch /launch
WORKDIR /home/user WORKDIR /home/user
VOLUME [ "/tmp" ] VOLUME [ "/tmp" ]
ENTRYPOINT [ "sh", "/launch" ] USER user
ENTRYPOINT [ "/usr/local/bin/hipchat4" ]

6
launch
View File

@ -1,6 +0,0 @@
#!/usr/bin/env sh
# Make HipChat grsec friendly
setfattr -n user.pax.flags -v m /opt/HipChat4/lib/HipChat.bin /opt/HipChat4/lib/QtWebEngineProcess.bin
su -p -s /bin/sh -c /usr/local/bin/hipchat4 user