From 43249bd443c875a25d6929fbb827b2d54ca957dc Mon Sep 17 00:00:00 2001 From: aptalca Date: Fri, 14 Jan 2022 14:55:42 -0500 Subject: [PATCH] compile goaccess with qemu --- .github/workflows/BuildImage.yml | 4 ++ Dockerfile | 64 ++++++++++++++++++++++-- root/etc/cont-init.d/98-dashboard-config | 11 +++- 3 files changed, 75 insertions(+), 4 deletions(-) diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml index 21c8db5..7b4271e 100644 --- a/.github/workflows/BuildImage.yml +++ b/.github/workflows/BuildImage.yml @@ -13,6 +13,10 @@ jobs: steps: - uses: actions/checkout@v2.3.3 + - name: Set up qemu + run: | + docker run --rm --privileged multiarch/qemu-user-static --reset -p yes + - name: Build image run: | docker build --no-cache -t ${{ github.sha }} . diff --git a/Dockerfile b/Dockerfile index a0bf705..69f0e31 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.15 as build-stage +FROM ghcr.io/linuxserver/baseimage-alpine:amd64-3.15 as build-stage-amd64 RUN \ echo "**** install packages ****" && \ @@ -24,10 +24,68 @@ RUN \ /goaccess/* \ /tmp/* +FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15 as build-stage-arm32v7 + +RUN \ + echo "**** install packages ****" && \ + apk add -U --update --no-cache --virtual=build-dependencies \ + autoconf \ + automake \ + build-base \ + git \ + glib-dev \ + libmaxminddb-dev \ + ncurses-dev && \ + mkdir -p /build && \ + mkdir -p /goaccess && \ + echo "**** build goaccess ****" && \ + git clone --shallow-submodules --recurse-submodules https://github.com/allinurl/goaccess.git /goaccess && cd /goaccess && \ + autoreconf -fiv && \ + ./configure --enable-utf8 --enable-geoip=mmdb && \ + make DESTDIR="/build" install && \ + echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /goaccess/* \ + /tmp/* + +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15 as build-stage-arm64v8 + +RUN \ + echo "**** install packages ****" && \ + apk add -U --update --no-cache --virtual=build-dependencies \ + autoconf \ + automake \ + build-base \ + git \ + glib-dev \ + libmaxminddb-dev \ + ncurses-dev && \ + mkdir -p /build && \ + mkdir -p /goaccess && \ + echo "**** build goaccess ****" && \ + git clone --shallow-submodules --recurse-submodules https://github.com/allinurl/goaccess.git /goaccess && cd /goaccess && \ + autoreconf -fiv && \ + ./configure --enable-utf8 --enable-geoip=mmdb && \ + make DESTDIR="/build" install && \ + echo "**** cleanup ****" && \ + apk del --purge \ + build-dependencies && \ + rm -rf \ + /goaccess/* \ + /tmp/* + +FROM scratch as build-stage-consolidate + +COPY --from=build-stage-amd64 /build/ /goaccess/x86_64/ +COPY --from=build-stage-arm32v7 /build/ /goaccess/armv7l/ +COPY --from=build-stage-arm64v8 /build/ /goaccess/aarch64/ +COPY root/ / + FROM scratch LABEL maintainer="quietsy" # copy local files -COPY root/ / -COPY --from=build-stage /build/ / +COPY --from=build-stage-consolidate / / diff --git a/root/etc/cont-init.d/98-dashboard-config b/root/etc/cont-init.d/98-dashboard-config index 30aeafb..ac11c0e 100644 --- a/root/etc/cont-init.d/98-dashboard-config +++ b/root/etc/cont-init.d/98-dashboard-config @@ -2,7 +2,16 @@ echo "Applying the SWAG dashboard mod..." -apk add libmaxminddb +ARCH=$(uname -m) +if [ -d "/goaccess/${ARCH}" ]; then + echo "**** Installing/updating goaccess ****" + cp -a /goaccess/${ARCH}/* / + rm -rf /goaccess +else + echo "**** Goaccess already installed and up to date ****" +fi + +apk add --no-cache libmaxminddb cp -f /dashboard/dashboard.subdomain.conf.sample /config/nginx/proxy-confs/dashboard.subdomain.conf.sample if [ ! -f /config/nginx/proxy-confs/dashboard.subdomain.conf ]; then cp /dashboard/dashboard.subdomain.conf.sample /config/nginx/proxy-confs/dashboard.subdomain.conf