Merge pull request #4 from Dreamwalker666/master+multistage

Issue #2 Use new multi-stage builds in Docker

Dockerfile

@@ -6,20 +6,37 @@ RUN apt-get install -y git
 RUN mkdir -p /go/src/github.com/oragono
 WORKDIR /go/src/github.com/oragono
 
-RUN git clone https://github.com/oragono/oragono.git
+RUN git clone -b stable https://github.com/oragono/oragono.git
 WORKDIR /go/src/github.com/oragono/oragono
 RUN git submodule update --init
-RUN make linux
 
-# run in Alpine, being a lightweight distro
-FROM alpine:latest
+# compile
+RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-s" -o build/docker/oragono oragono.go
+
+# run in a lightweight distro
+FROM alpine
+
+# install latest updates and configure alpine
+RUN apk update
+RUN apk upgrade
+RUN mkdir /lib/modules
+
+# standard ports listened on
 EXPOSE 6667/tcp 6697/tcp
 
+# prep and copy oragono from build environment
 RUN mkdir -p /ircd
 WORKDIR /ircd
+COPY --from=build-env /go/src/github.com/oragono/oragono/build/docker/ .
+COPY --from=build-env /go/src/github.com/oragono/oragono/oragono.yaml ./ircd.yaml
+
+# init
+RUN ./oragono initdb
+RUN ./oragono mkcerts
 
-COPY --from=build-env /go/src/github.com/oragono/oragono/build/oragono-XXX-linux.tgz /
-RUN tar -xzf /oragono-XXX-linux.tgz
-COPY run.sh /ircd
+# launch
+CMD ./oragono run
 
-CMD ["./run.sh"]
+# uncomment to debug
+#RUN apk add bash nano
+#CMD /bin/bash

run.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ ! -f ./ircd.yaml ]; then
-  cp oragono.yaml ircd.yaml
-fi
-
-if [ ! -f ircd.db ]; then
-  ./oragono initdb
-fi
-
-if [ ! -f tls.crt ]; then
-  ./oragono mkcerts
-fi
-
-exec ./oragono run