Merge pull request #173 from linuxserver/3.17-branding

Dockerfile

@@ -79,6 +79,7 @@ RUN \
     coreutils \
     curl \
     jq \
+    netcat-openbsd \
     procps \
     shadow \
     tzdata && \

Dockerfile.aarch64

@@ -79,6 +79,7 @@ RUN \
     coreutils \
     curl \
     jq \
+    netcat-openbsd \
     procps \
     shadow \
     tzdata && \

Dockerfile.armhf

@@ -79,6 +79,7 @@ RUN \
     coreutils \
     curl \
     jq \
+    netcat-openbsd \
     procps \
     shadow \
     tzdata && \

Jenkinsfile

@@ -31,7 +31,7 @@ pipeline {
     CI_PORT='80'
     CI_SSL='true'
     CI_DELAY='30'
-    CI_DOCKERENV='TZ=US/Pacific'
+    CI_DOCKERENV='TZ=US/Pacific|LSIO_FIRST_PARTY=true'
     CI_AUTH='user:password'
     CI_WEBPATH=''
   }

jenkins-vars.yml

@@ -21,6 +21,6 @@ repo_vars:
   - CI_PORT='80'
   - CI_SSL='true'
   - CI_DELAY='30'
-  - CI_DOCKERENV='TZ=US/Pacific'
+  - CI_DOCKERENV='TZ=US/Pacific|LSIO_FIRST_PARTY=true'
   - CI_AUTH='user:password'
   - CI_WEBPATH=''

root/etc/s6-overlay/s6-rc.d/00-legacy/up

@@ -1 +0,0 @@
-ln -s /run/s6/legacy-services /run/s6/services

root/etc/s6-overlay/s6-rc.d/99-ci-service-check/type

@@ -1 +0,0 @@
-oneshot

root/etc/s6-overlay/s6-rc.d/init-adduser/branding

@@ -0,0 +1,12 @@
+───────────────────────────────────────
+  _____ __ __ _____ _____ _____ _____ 
+ |     |  |  |   __|_   _|     |     |
+ |   --|  |  |__   | | | |  |  | | | |
+ |_____|_____|_____| |_| |_____|_|_|_|
+       _____ __ __ _ __    ____  
+      | __  |  |  | |  |  |    \ 
+      | __ -|  |  | |  |__|  |  |
+      |_____|_____|_|_____|____/ 
+
+  Based on images from linuxserver.io
+───────────────────────────────────────

root/etc/s6-overlay/s6-rc.d/init-adduser/run

@@ -7,17 +7,8 @@ PGID=${PGID:-911}
 groupmod -o -g "$PGID" abc
 usermod -o -u "$PUID" abc
 
-echo '
+cat /etc/s6-overlay/s6-rc.d/init-adduser/branding
--------------------------------------
-          _         ()
-         | |  ___   _    __
-         | | / __| | |  /  \
-         | | \__ \ | | | () |
-         |_| |___/ |_|  \__/
 
-
-Brought to you by linuxserver.io
--------------------------------------'
 if [[ -f /donate.txt ]]; then
     echo '
 To support the app dev(s) visit:'
@@ -26,32 +17,33 @@ fi
 echo '
 To support LSIO projects visit:
 https://www.linuxserver.io/donate/
--------------------------------------
+
+───────────────────────────────────────
 GID/UID
--------------------------------------'
+───────────────────────────────────────'
 echo "
-User uid:    $(id -u abc)
+User UID:    $(id -u abc)
-User gid:    $(id -g abc)
+User GID:    $(id -g abc)
--------------------------------------
+───────────────────────────────────────
 "
 
 time32="$(date +%Y)"
 
 if [[ "${time32}" == "1970" || "${time32}" == "1969" ]] && [ "$(uname -m)" == "armv7l" ]; then
     echo '
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+╔═════════════════════════════════════════════════════════════════════════════╗
-
+║                                                                             ║
-Your DockerHost is running an outdated version of libseccomp
+║        Your Docker Host is running an outdated version of libseccomp        ║
-
+║                                                                             ║
-To fix this, please visit https://docs.linuxserver.io/faq#libseccomp
+║    To fix this, please visit https://docs.linuxserver.io/faq#libseccomp     ║
-
+║                                                                             ║
-Apps will not behave correctly without this
+║                 Apps will not behave correctly without this                 ║
-
+║                                                                             ║
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
+╚═════════════════════════════════════════════════════════════════════════════╝
 '
     sleep infinity
 fi
 
-chown abc:abc /app
+lsiown abc:abc /app
-chown abc:abc /config
+lsiown abc:abc /config
-chown abc:abc /defaults
+lsiown abc:abc /defaults

root/usr/bin/with-contenv

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-if [[ -f /run/s6/container_environment/UMASK ]] &&
-    { [[ "$(pwdx $$)" =~ "/run/s6/legacy-services/" ]] ||
-        [[ "$(pwdx $$)" =~ "/run/s6/services/" ]] ||
-        [[ "$(pwdx $$)" =~ "/servicedirs/svc-" ]]; }; then
-    umask "$(cat /run/s6/container_environment/UMASK)"
-fi
-exec /command/with-contenv "$@"