From 3156efff732f5ce1f322205990137b2bf7f9277a Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Mon, 25 Nov 2019 11:54:52 +0100
Subject: [PATCH] LibreNMS 1.58

---
 CHANGELOG.md          |  6 ++++++
 Dockerfile            |  8 +++++---
 doc/notes/validate.md | 21 +++++++++------------
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0b4178..b2bd800 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.58-RC1 (2019/11/25)
+
+* LibreNMS 1.58
+* Remove useless `.git` folder
+* Add `LIBRENMS_DOCKER` env (librenms/librenms#10879)
+
 ## 1.57-RC2 (2019/11/19)
 
 * :warning: Run as non-root user (#6)
diff --git a/Dockerfile b/Dockerfile
index 9f6d99a..c16ee9b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,6 +42,7 @@ RUN apk --update --no-cache add \
     php7-cli \
     php7-ctype \
     php7-curl \
+    php7-dom \
     php7-fileinfo \
     php7-fpm \
     php7-gd \
@@ -87,8 +88,9 @@ RUN apk --update --no-cache add \
   && setcap cap_net_raw+ep /usr/bin/nmap \
   && setcap cap_net_raw+ep /usr/sbin/fping
 
-ENV LIBRENMS_VERSION="1.57" \
+ENV LIBRENMS_VERSION="1.58" \
   LIBRENMS_PATH="/opt/librenms" \
+  LIBRENMS_DOCKER="1" \
   PUID="1000" \
   PGID="1000" \
   S6_BEHAVIOUR_IF_STAGE2_FAILS="2"
@@ -96,7 +98,7 @@ ENV LIBRENMS_VERSION="1.57" \
 RUN mkdir -p /opt \
   && curl -sSL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer \
   && git clone --branch ${LIBRENMS_VERSION} https://github.com/librenms/librenms.git ${LIBRENMS_PATH} \
-  && composer install --no-dev --no-interaction --no-ansi --working-dir=${LIBRENMS_PATH} \
+  && COMPOSER_CACHE_DIR="/tmp" composer install --no-dev --no-interaction --no-ansi --working-dir=${LIBRENMS_PATH} \
   && curl -sSLk -q https://raw.githubusercontent.com/librenms/librenms-agent/master/snmp/distro -o /usr/bin/distro \
   && chmod +x /usr/bin/distro \
   && mkdir -p ${LIBRENMS_PATH}/config.d \
@@ -107,7 +109,7 @@ RUN mkdir -p /opt \
   && echo "foreach (glob(\"${LIBRENMS_PATH}/config.d/*.php\") as \$filename) include \$filename;" >> ${LIBRENMS_PATH}/config.php \
   && pip3 install -r ${LIBRENMS_PATH}/requirements.txt \
   && chown -R nobody.nogroup ${LIBRENMS_PATH} \
-  && rm -rf /tmp/*
+  && rm -rf ${LIBRENMS_PATH}/.git /tmp/*
 
 COPY rootfs /
 
diff --git a/doc/notes/validate.md b/doc/notes/validate.md
index 797d017..5248447 100644
--- a/doc/notes/validate.md
+++ b/doc/notes/validate.md
@@ -7,22 +7,19 @@ $ docker-compose exec --user librenms librenms php validate.php
 ====================================
 Component | Version
 --------- | -------
-LibreNMS  | 1.41
-DB Schema | 253
-PHP       | 7.2.7
-MySQL     | 10.2.16-MariaDB-10.2.16+maria~jessie
-RRDTool   | 1.7.0
-SNMP      | NET-SNMP 5.7.3
+LibreNMS  | 1.58
+DB Schema | 2019_10_03_211702_serialize_config (147)
+PHP       | 7.3.11
+MySQL     | 10.4.8-MariaDB-1:10.4.8+maria~bionic
+RRDTool   | 1.7.2
+SNMP      | NET-SNMP 5.8
 ====================================
 
-[OK]    Composer Version: 1.6.5
-[OK]    Dependencies up-to-date.
+[OK]    Installed from package; no Composer required
 [OK]    Database connection successful
 [OK]    Database schema correct
 [WARN]  You have not added any devices yet.
         [FIX] You can add a device in the webui or with ./addhost.php
-[WARN]  Your install is over 24 hours out of date, last update: Sat, 30 Jun 2018 21:37:37 +0000
-        [FIX] Make sure your daily.sh cron is running and run ./daily.sh by hand to see if there are any errors.
-[WARN]  Your local git branch is not master, this will prevent automatic updates.
-        [FIX] You can switch back to master with git checkout master
+[WARN]  IPv6 is disabled on your server, you will not be able to add IPv6 devices.
+[WARN]  Non-git install, updates are manual or from package
 ```