aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael McVady <femtonaut@gmail.com>2022-03-10 19:21:29 -0500
committerMichael McVady <femtonaut@gmail.com>2022-03-10 19:21:29 -0500
commit4045e192915a4d976a159720e97e744c3773bf99 (patch)
tree11cc960510c0a6f82e9d213e308808472d7f1a53
parentd87a2d7fea8ba6fafe1b4dfa714dcaf715df683c (diff)
Sort of runs in docker
-rw-r--r--Dockerfile26
-rw-r--r--Makefile2
2 files changed, 10 insertions, 18 deletions
diff --git a/Dockerfile b/Dockerfile
index 92f6626..03d0df6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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"]
diff --git a/Makefile b/Makefile
index 003b2aa..de542fb 100644
--- a/Makefile
+++ b/Makefile
@@ -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