From eecc7d8a590ff1abecfa8b5ab308713f37e648d3 Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Thu, 3 Sep 2020 22:35:39 +0200
Subject: [PATCH] Now based on Alpine Linux 3.12 with s6 overlay

---
 .github/workflows/build.yml |  2 +-
 Dockerfile                  | 14 +-------------
 README.md                   |  1 +
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7cb4561..21036f9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -26,7 +26,7 @@ jobs:
         id: prepare
         run: |
           DOCKER_IMAGE=librenms/librenms
-          DOCKER_PLATFORMS=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le
+          DOCKER_PLATFORMS=linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/386,linux/ppc64le,linux/s390x
           VERSION=edge
 
           if [[ $GITHUB_REF == refs/tags/* ]]; then
diff --git a/Dockerfile b/Dockerfile
index 17ed7b1..bfbd516 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=${TARGETPLATFORM:-linux/amd64} alpine:3.12
+FROM --platform=${TARGETPLATFORM:-linux/amd64} crazymax/alpine-s6:3.12
 
 ARG BUILD_DATE
 ARG VCS_REF
@@ -87,18 +87,6 @@ RUN apk --update --no-cache add \
     mariadb-dev \
     musl-dev \
     python3-dev \
-  && S6_ARCH=$(case ${TARGETPLATFORM:-linux/amd64} in \
-    "linux/amd64")   echo "amd64"   ;; \
-    "linux/arm/v6")  echo "arm"     ;; \
-    "linux/arm/v7")  echo "armhf"   ;; \
-    "linux/arm64")   echo "aarch64" ;; \
-    "linux/386")     echo "x86"     ;; \
-    "linux/ppc64le") echo "ppc64le" ;; \
-    *)               echo ""        ;; esac) \
-  && echo "S6_ARCH=$S6_ARCH" \
-  && wget -q "https://github.com/just-containers/s6-overlay/releases/latest/download/s6-overlay-${S6_ARCH}.tar.gz" -qO "/tmp/s6-overlay-${S6_ARCH}.tar.gz" \
-  && tar xzf /tmp/s6-overlay-${S6_ARCH}.tar.gz -C / \
-  && s6-echo "s6-overlay installed" \
   && pip3 install --upgrade pip \
   && pip3 install python-memcached mysqlclient --upgrade \
   && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer \
diff --git a/README.md b/README.md
index 3e541ff..602e533 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,7 @@ Image: librenms/librenms:latest
    - linux/arm64
    - linux/386
    - linux/ppc64le
+   - linux/s390x
 ```
 
 ## Documentation