Merge pull request #1 from paultag/master

Add a shim to znc
This commit is contained in:
Jessie Frazelle 2014-10-15 20:01:09 -07:00
commit 812193a6b1
2 changed files with 28 additions and 2 deletions

View File

@ -7,6 +7,7 @@ RUN apt-get update && apt-get install -y \
libperl-dev \ libperl-dev \
pkg-config \ pkg-config \
curl \ curl \
sudo \
--no-install-recommends --no-install-recommends
# get the source # get the source
@ -15,7 +16,21 @@ RUN curl -sSL http://znc.in/releases/znc-latest.tar.gz | tar -v -C /znc-tmp -xz
RUN mv /znc-tmp/znc* /znc; rm -rf /znc-tmp RUN mv /znc-tmp/znc* /znc; rm -rf /znc-tmp
# install it # install it
RUN cd /znc; ./configure; make; make install RUN cd /znc; ./configure; make -j8; make install
RUN rm -rf /znc
RUN mkdir /znc
ADD znc-shim /usr/local/bin/znc-shim
RUN adduser \
--system \
--home=/znc \
--shell=/bin/sh \
--no-create-home \
--group \
znc
WORKDIR /znc
ENTRYPOINT ["/usr/local/bin/znc-shim"]
# make basic config # make basic config
# RUN znc --makeconf # RUN znc --makeconf
@ -23,4 +38,4 @@ RUN cd /znc; ./configure; make; make install
# add local config # add local config
# ADD conf /.znc # ADD conf /.znc
# CMD [ "znc", "-f", "-r" ] # CMD [ "znc", "-f", "-r" ]

11
znc/znc-shim Executable file
View File

@ -0,0 +1,11 @@
#!/bin/bash
set -e
ZNC_DIR="/znc"
ZNC_OWNER=$(stat -c "%U" ${ZNC_DIR})
if [ "${ZNC_OWNER}" != "znc" ]; then
chown -R znc:znc ${ZNC_DIR}
fi
exec sudo -u znc "$@"