Merge pull request #14 from linuxserver/3.17

.github/workflows/call_invalid_helper.yml

@@ -0,0 +1,12 @@
+name: Comment on invalid interaction
+on:
+  issues:
+    types:
+      - labeled
+jobs:
+  add-comment-on-invalid:
+    if: github.event.label.name == 'invalid'
+    permissions:
+      issues: write
+    uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1
+    secrets: inherit

Dockerfile

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:3.17
 
 # set version label
 ARG BUILD_DATE
@@ -10,11 +12,8 @@ LABEL maintainer="thelamer"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
-    curl \
-    g++ \
-    gcc \
+    build-base \
     libsass-dev \
-    make \
     npm && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
@@ -34,23 +33,18 @@ RUN \
     /app/raneto --strip-components=1 && \
   echo "**** install raneto node dev modules and build ****" && \
   cd /app/raneto && \
-  npm config set unsafe-perm true && \
-  npm install gulp && \
-  npm install --production && \
-  node node_modules/gulp/bin/gulp.js && \
-  npm uninstall gulp && \
+  npm install --omit=dev && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
   rm -rf \
-    /root \
-    /tmp/* && \
-  mkdir -p \
-    /root
+    $HOME/.npm \
+    /tmp/*
 
 # copy local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 3000
+
 VOLUME /config

Dockerfile.aarch64

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -10,11 +12,8 @@ LABEL maintainer="thelamer"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
-    curl \
-    g++ \
-    gcc \
+    build-base \
     libsass-dev \
-    make \
     npm && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
@@ -34,23 +33,18 @@ RUN \
     /app/raneto --strip-components=1 && \
   echo "**** install raneto node dev modules and build ****" && \
   cd /app/raneto && \
-  npm config set unsafe-perm true && \
-  npm install gulp && \
-  npm install --production && \
-  node node_modules/gulp/bin/gulp.js && \
-  npm uninstall gulp && \
+  npm install --omit=dev && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
   rm -rf \
-    /root \
-    /tmp/* && \
-  mkdir -p \
-    /root
+    $HOME/.npm \
+    /tmp/*
 
 # copy local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 3000
+
 VOLUME /config

Dockerfile.armhf

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -10,11 +12,8 @@ LABEL maintainer="thelamer"
 RUN \
   echo "**** install build packages ****" && \
   apk add --no-cache --virtual=build-dependencies \
-    curl \
-    g++ \
-    gcc \
+    build-base \
     libsass-dev \
-    make \
     npm && \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
@@ -34,23 +33,18 @@ RUN \
     /app/raneto --strip-components=1 && \
   echo "**** install raneto node dev modules and build ****" && \
   cd /app/raneto && \
-  npm config set unsafe-perm true && \
-  npm install gulp && \
-  npm install --production && \
-  node node_modules/gulp/bin/gulp.js && \
-  npm uninstall gulp && \
+  npm install --omit=dev && \
   echo "**** cleanup ****" && \
   apk del --purge \
     build-dependencies && \
   rm -rf \
-    /root \
-    /tmp/* && \
-  mkdir -p \
-    /root
+    $HOME/.npm \
+    /tmp/*
 
 # copy local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 3000
+
 VOLUME /config

README.md

@@ -230,6 +230,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **18.01.23:** - Rebase to Alpine 3.17, migrate to s6v3.
 * **10.08.22:** - Rebasing to alpine 3.15.
 * **23.01.21:** - Rebasing to alpine 3.13.
 * **02.06.20:** - Rebasing to alpine 3.11.

readme-vars.yml

@@ -42,6 +42,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "18.01.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3." }
   - { date: "10.08.22:", desc: "Rebasing to alpine 3.15." }
   - { date: "23.01.21:", desc: "Rebasing to alpine 3.13." }
   - { date: "02.06.20:", desc: "Rebasing to alpine 3.11." }

root/etc/s6-overlay/s6-rc.d/init-raneto-config/run

@@ -1,21 +1,29 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 # make directories if necessary
 mkdir -p /config/content
+
 i=/app/raneto/themes/default/public/images
-[[ -e "$i" && ! -L "$i" && -e /config/"$(basename "$i")" ]] && \
+if [[ -e "$i" && ! -L "$i" && -e /config/"$(basename "$i")" ]]; then
     rm -Rf "$i" && \
     ln -s /config/"$(basename "$i")" "$i"
-[[ -e "$i" && ! -L "$i" ]] && \
+fi
+
+if [[ -e "$i" && ! -L "$i" ]]; then
     mv "$i" /config/"$(basename "$i")" && \
     ln -s /config/"$(basename "$i")" "$i"
+fi
 
 # create local user server files
-[[ ! -f /config/config.default.js ]] && \
+if [[ ! -f /config/config.default.js ]]; then
     cp /defaults/config.default.js /config/config.default.js
-[[ ! -f /app/raneto/server.js ]] && \
+fi
+
+if [[ ! -f /app/raneto/server.js ]]; then
     cp /defaults/server.js /app/raneto/server.js
+fi
 
 # permissions
-chown -R abc:abc \
+lsiown -R abc:abc \
     /config 

root/etc/s6-overlay/s6-rc.d/init-raneto-config/type

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

root/etc/s6-overlay/s6-rc.d/init-raneto-config/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-raneto-config/run

root/etc/s6-overlay/s6-rc.d/svc-raneto/notification-fd

@@ -0,0 +1 @@
+3

root/etc/s6-overlay/s6-rc.d/svc-raneto/run

@@ -0,0 +1,6 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+exec \
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 3000" \
+    cd /app/raneto s6-setuidgid abc node server.js

root/etc/s6-overlay/s6-rc.d/svc-raneto/type

@@ -0,0 +1 @@
+longrun

root/etc/services.d/raneto/run

@@ -1,6 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-cd /app/raneto || exit
-
-DEBUG=raneto exec \
-    s6-setuidgid abc node server.js