From cddc5e906a3e7f8a446829ad0a4d560739106060 Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Thu, 4 Mar 2021 23:44:23 +0100
Subject: [PATCH] Switch to yasu (#170)

Co-authored-by: CrazyMax <crazy-max@users.noreply.github.com>
---
 CHANGELOG.md                 | 4 ++++
 Dockerfile                   | 9 +++------
 rootfs/usr/local/bin/artisan | 2 +-
 rootfs/usr/local/bin/lnms    | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)
 mode change 100644 => 100755 rootfs/usr/local/bin/artisan
 mode change 100644 => 100755 rootfs/usr/local/bin/lnms

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7477ef91..1cde055b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 21.2.0-r1 (2021/03/04)
+
+* Switch to `yasu`
+
 ## 21.2.0-r0 (2021/02/16)
 
 * LibreNMS 21.2.0 (#167)
diff --git a/Dockerfile b/Dockerfile
index 1e596a77..92236053 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,11 +1,10 @@
 ARG LIBRENMS_VERSION="21.2.0"
 
-FROM --platform=${TARGETPLATFORM:-linux/amd64} crazymax/alpine-s6:3.13-2.2.0.3
-ARG TARGETPLATFORM
-ARG BUILDPLATFORM
-
+FROM crazymax/yasu:latest AS yasu
+FROM crazymax/alpine-s6:3.13-2.1.0.2
 LABEL maintainer="CrazyMax"
 
+COPY --from=yasu / /
 RUN apk --update --no-cache add \
     busybox-extras \
     acl \
@@ -63,7 +62,6 @@ RUN apk --update --no-cache add \
     rrdtool \
     runit \
     shadow \
-    su-exec \
     syslog-ng=3.30.1-r0 \
     ttf-dejavu \
     tzdata \
@@ -131,7 +129,6 @@ RUN apk --update --no-cache add -t build-dependencies \
     /var/cache/apk/*
 
 COPY rootfs /
-RUN chmod a+x /usr/local/bin/*
 
 EXPOSE 8000 514 514/udp
 VOLUME [ "/data" ]
diff --git a/rootfs/usr/local/bin/artisan b/rootfs/usr/local/bin/artisan
old mode 100644
new mode 100755
index d6b79355..e9ab72fa
--- a/rootfs/usr/local/bin/artisan
+++ b/rootfs/usr/local/bin/artisan
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 cd /opt/librenms || exit 1
-su-exec librenms:librenms php artisan "$@"
+yasu librenms:librenms php artisan "$@"
diff --git a/rootfs/usr/local/bin/lnms b/rootfs/usr/local/bin/lnms
old mode 100644
new mode 100755
index 505acc4d..58c42365
--- a/rootfs/usr/local/bin/lnms
+++ b/rootfs/usr/local/bin/lnms
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-su-exec librenms:librenms php -f /opt/librenms/lnms "$@"
+yasu librenms:librenms php -f /opt/librenms/lnms "$@"