Merge pull request #3 from connectitnet/fping6

Fix for missing binary fping6 in alpine and permissions

Dockerfile

@@ -16,6 +16,7 @@ LABEL maintainer="CrazyMax" \
   org.label-schema.schema-version="1.0"
 
 RUN apk --update --no-cache add \
+    acl \
     bash \
     binutils \
     ca-certificates \
@@ -79,12 +80,13 @@ ENV LIBRENMS_VERSION="1.43" \
 
 RUN mkdir -p /opt \
   && addgroup -g 1000 librenms \
-  && adduser -u 1000 -G librenms -h ${LIBRENMS_PATH} -s /sbin/nologin -D librenms \
+  && adduser -u 1000 -G librenms -h ${LIBRENMS_PATH} -s /bin/sh -D librenms \
+  && passwd -l librenms \
   && usermod -a -G librenms nginx \
   && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer \
   && git clone --branch ${LIBRENMS_VERSION} https://github.com/librenms/librenms.git ${LIBRENMS_PATH} \
   && chown -R librenms. ${LIBRENMS_PATH} \
-  && su - librenms -s /bin/sh -c "composer install --no-dev --no-interaction --no-ansi --working-dir=${LIBRENMS_PATH}" \
+  && su - librenms -c "composer install --no-dev --no-interaction --no-ansi --working-dir=${LIBRENMS_PATH}" \
   && wget -q https://raw.githubusercontent.com/librenms/librenms-agent/master/snmp/distro -O /usr/bin/distro \
   && chmod +x /usr/bin/distro \
   && rm -rf /tmp/*

entrypoint.sh

@@ -143,9 +143,12 @@ cat > ${LIBRENMS_PATH}/config.d/user.php <<EOL
 EOL
 
 # Config : Fping
+echo "/usr/sbin/fping -6 \$@" > /usr/sbin/fping6
+chmod +x /usr/sbin/fping6
 cat > ${LIBRENMS_PATH}/config.d/fping.php <<EOL
 <?php
 \$config['fping'] = "/usr/sbin/fping";
+\$config['fping6'] = "/usr/sbin/fping6";
 EOL
 
 # Config : Disable autoupdate