diff options
| -rw-r--r-- | Dockerfile | 26 | ||||
| -rw-r--r-- | Makefile | 2 |
2 files changed, 10 insertions, 18 deletions
@@ -4,15 +4,12 @@ MAINTAINER Michael McVady <femtonaut@gmail.com> RUN set -e \ && apk add --no-cache \ - curl \ - libpq + busybox-extras + +# COPY . /clog RUN set -e \ && mkdir -p /var/chroot \ - && addgroup -g 500 keymgr \ - && adduser -D -u 500 -h /var/chroot/keymgr -s /sbin/nologin -G keymgr keymgr \ - && addgroup -g 501 acme \ - && adduser -D -u 501 -h /var/chroot/acme -s /sbin/nologin -G acme acme \ && addgroup -g 502 kore \ && adduser -D -u 502 -h /var/chroot/kore -s /sbin/nologin -G kore kore \ && apk add --no-cache --virtual .build-deps \ @@ -21,33 +18,28 @@ RUN set -e \ bsd-compat-headers \ gcc \ make \ - openssl-dev \ postgresql-dev \ pkgconfig \ - libcurl \ - curl-dev \ libpq \ - && curl -O https://kore.io/releases/kore-4.1.0.tar.gz \ + && wget https://kore.io/releases/kore-4.1.0.tar.gz \ && tar zfvx kore-4.1.0.tar.gz \ && cd kore-4.1.0 \ && make clean \ - && make CURL=1 NOTLS=1 PGSQL=1 \ + && make NOTLS=1 PGSQL=1 \ && make install \ && cd .. \ && rm -rf kore-4.1.0* -# && apk del .build-deps COPY . /clog RUN set -e \ && cd /clog \ && kodev build +# && apk del .build-deps -RUN set -e \ - && apk del .build-deps - -EXPOSE 443 8888 8889 +EXPOSE 8888 STOPSIGNAL SIGQUIT WORKDIR /clog -ENTRYPOINT [ "kore", "-c", "conf/clog.conf", "-r", "-n", "-f"] +# ENTRYPOINT [ "kore", "-c", "conf/clog.conf", "-r", "-n", "-f"] +ENTRYPOINT [ "kodev", "run"] @@ -11,7 +11,7 @@ docker-build: docker build -t clog . docker-run: - docker run --name clog -p 8888:8888 -p 8889:8889 -d clog:latest + docker run --name clog -p 8888:8888 -d clog:latest build: kodev build |