Merge pull request allinurl#1453 from err931/rewrite_dockerfile

rewrite Dockerfile

Dockerfile

@@ -1,25 +1,63 @@
-# Builds a goaccess image from the current working directory:
-FROM alpine:edge
+# Copyright 2019 Hiroki Kamino.
+# Originally under MIT in Gerardo Orellana. https://goaccess.io/
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
+FROM alpine:edge AS builds
+RUN apk add --no-cache \
+	autoconf \
+	automake \
+	build-base \
+	clang \
+	clang-static \
+	cmake \
+	gettext-dev \
+	gettext-static \
+	git \
+	linux-headers \
+	ncurses-dev \
+	ncurses-static \
+	rsync \
+	tzdata \
+	xz
+
+# Environment
+ENV CC clang
+ENV LIBRESSL_VER 2.9.1
+
+# LibreSSL
+WORKDIR /libressl
+RUN rsync -q rsync://mirror.leaseweb.com/openbsd/LibreSSL/libressl-${LIBRESSL_VER}.tar.gz .
+RUN tar zxf libressl-${LIBRESSL_VER}.tar.gz --strip 1
+RUN cmake . \
+	-DCMAKE_BUILD_TYPE=Release \
+	-DCMAKE_INSTALL_PREFIX=/usr
+RUN make && make install
+
+# GoAccess
 COPY . /goaccess
 WORKDIR /goaccess
+RUN autoreconf -fiv
+RUN CFLAGS="-O3 -static" LIBS="$(pkg-config --libs openssl)" ./configure --prefix="" --enable-utf8 --with-openssl
+RUN make && make DESTDIR=/dist install
 
-ARG build_deps="build-base ncurses-dev autoconf automake git gettext-dev"
-ARG runtime_deps="tini ncurses libintl gettext openssl-dev"
+# Time Zone
+RUN tar Jcf /dist/tzdata.tar.xz -C /usr/share/zoneinfo/right .
 
-RUN apk update && \
-    apk add -u $runtime_deps $build_deps && \
-    autoreconf -fiv && \
-    ./configure --enable-utf8 --with-openssl && \
-    make && \
-    make install && \
-    apk del $build_deps && \
-    rm -rf /var/cache/apk/* /tmp/goaccess/* /goaccess
-
-VOLUME /srv/data
-VOLUME /srv/logs
-VOLUME /srv/report
+# Container
+FROM busybox:musl
+COPY --from=builds /dist /
+VOLUME /var/www/goaccess
 EXPOSE 7890
-
-ENTRYPOINT ["/sbin/tini", "--"]
-CMD ["goaccess", "--no-global-config", "--config-file=/srv/data/goaccess.conf"]
+ENTRYPOINT ["/bin/goaccess"]
+CMD ["--help"]

README.md

@@ -197,6 +197,20 @@ Distro                 | NCurses          | GeoIP (opt)      | Tokyo Cabinet (op
 
 ### Docker ###
 
+**New!**: Docker image has been updated. This allows direct output from the access log.
+
+If you only want to output the report, run as follows to get the result:
+
+    cat access.log | docker run --rm -i -e LANG=$LANG allinurl/goaccess -a -o html --log-format COMBINED > report.html
+
+**This command uses the language set for this system.** If that does not support it will be output in English. [**Supported Language**](https://github.com/allinurl/goaccess/raw/master/po/LINGUAS)
+
+**This image supports building on the ARM architecture.** (e.g. Raspberry Pi)
+
+**Do you want to change the timezone?** Copy the timezone configuration file in `tzdata.tar.xz` to `/etc/localtime`.
+
+---
+
 **Note**: The following example assumes you will store your GoAccess data below
 ``/srv/goaccess``, but you can use a different prefix if you like or if you run
 as non-root user.