diff options
| -rw-r--r-- | Dockerfile | 31 | ||||
| -rw-r--r-- | conf/clog.conf | 4 |
2 files changed, 23 insertions, 12 deletions
@@ -7,9 +7,6 @@ COPY . /tmp/clog ARG KORE_VERSION=4.2.2 RUN set -e \ - && mkdir -p /var/chroot \ - && addgroup --gid 502 kore \ - && adduser --disabled-password --uid 502 --home /var/chroot/kore --shell /sbin/nologin --ingroup kore kore \ && apt-get update -qq \ && apt-get install -y \ curl \ @@ -26,15 +23,29 @@ RUN set -e \ && make \ && make install \ && cd /tmp/clog \ - && kodev build \ - && cp -r assets /var/chroot/kore/. \ - && mkdir /clog \ - && cp clog /clog/. \ - && rm -rf /tmp/clog \ - && rm -rf /tmp/kore-${KORE_VERSION} + && kodev build + +FROM debian:bullseye-slim + +LABEL maintainer="Michael McVady <femtonaut@gmail.com>" + +RUN set -e \ + && mkdir -p /var/chroot \ + && addgroup --gid 502 clog \ + && adduser --disabled-password --uid 502 --home /var/chroot/clog --shell /sbin/nologin --ingroup clog clog \ + && apt-get update -qq \ + && apt-get install -y \ + curl \ + pkg-config \ + libssl-dev \ + libpq-dev + +WORKDIR /var/chroot/clog + +COPY --from=0 /tmp/clog/assets /var/chroot/clog/assets/. +COPY --from=0 /tmp/clog/clog /var/chroot/clog/. EXPOSE 8888 STOPSIGNAL SIGQUIT -WORKDIR /clog ENTRYPOINT [ "./clog", "-f"] diff --git a/conf/clog.conf b/conf/clog.conf index 23ad8d0..d32865b 100644 --- a/conf/clog.conf +++ b/conf/clog.conf @@ -10,9 +10,9 @@ server notls { workers 4 privsep worker { - runas kore + runas clog - root /var/chroot/kore + root /var/chroot/clog } seccomp_tracing no |