docker iteration

2 files changed, 56 insertions, 44 deletions

diff --git a/Dockerfile b/Dockerfile
index aa15240..92f6626 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,46 +1,53 @@
-FROM alpine:latest
-
-MAINTAINER Joris Vink <joris@coders.se>
-
-RUN apk add --no-cache \
-  curl \
-  libpq \
-  python
-
-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 \
-  musl-dev \
-  linux-headers \
-  bsd-compat-headers \
-  gcc \
-  make \
-  openssl-dev \
-  postgresql-dev \
-  pkgconfig \
-  libcurl \
-  curl-dev \
-  libpq \
-  python-dev && \
-  curl -O 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 PYTHON=1 ACME=1 CURL=1 PGSQL=1 && \
-  make install && \
-  cd .. && \
-  rm -rf kore-4.1.0* && \
-  apk del .build-deps
-
-COPY entry.sh /
-
-EXPOSE 443 8888
+FROM alpine:3.13
+
+MAINTAINER Michael McVady <femtonaut@gmail.com>
+
+RUN set -e \
+	&& apk add --no-cache \
+		curl \
+		libpq
+
+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 \
+		musl-dev \
+		linux-headers \
+		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 \
+	&& tar zfvx kore-4.1.0.tar.gz \
+	&& cd kore-4.1.0 \
+	&& make clean \
+	&& make CURL=1 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
+
+RUN set -e \
+	&& apk del .build-deps
+
+EXPOSE 443 8888 8889
 STOPSIGNAL SIGQUIT
 
-ENTRYPOINT [ "/entry.sh" ]
+WORKDIR /clog
+ENTRYPOINT [ "kore", "-c", "conf/clog.conf", "-r", "-n", "-f"]
diff --git a/Makefile b/Makefile
index bef50b5..003b2aa 100644
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,15 @@ all: build
 
 clean:
 	kodev clean
+	docker rm -f clog
+	docker rmi -f clog:latest
 
 docker-build:
 	docker build -t clog .
 
+docker-run:
+	docker run --name clog  -p 8888:8888 -p 8889:8889 -d clog:latest
+
 build:
 	kodev build