Merge pull request #11 from linuxserver-labs/3.17

linuxserver-labs · Jan 23, 2023 · 35c0833 · 35c0833
2 parents 77efb27 + b69fc7a
commit 35c0833
Show file tree

Hide file tree

Showing 19 changed files with 89 additions and 81 deletions.
diff --git a/.github/workflows/call-baseimage-update.yml b/.github/workflows/call-baseimage-update.yml
@@ -11,7 +11,7 @@ jobs:
     with:
       repo_owner: ${{ github.repository_owner }}
       baseimage: "alpine-nginx"
-      basebranch: "3.15"
+      basebranch: "3.17"
       app_name: "your_spotify"
     secrets:
       repo_release_token: ${{ secrets.repo_release_token }}
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15 as server-buildstage
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:3.17 as server-buildstage
 
 # set version label
 ARG BUILD_DATE
@@ -9,11 +11,6 @@ RUN \
   apk -U --update --no-cache add --virtual=server-build-dependencies \
     build-base \
     cmake \
-    curl \
-    gcc \
-    g++ \
-    jq \
-    make \
     npm \
     python3-dev \
     yarn && \
@@ -25,11 +22,11 @@ RUN \
   curl -o \
     /tmp/your_spotify.tar.gz -L \
     "https://github.com/Yooooomi/your_spotify/archive/${APP_VERSION}.tar.gz" && \
-  mkdir -p /app/your_spotify && \
+  mkdir -p /app/www && \
   tar xzf \
     /tmp/your_spotify.tar.gz -C \
-    /app/your_spotify/ --strip-components=1 && \
-  cd /app/your_spotify/server && \
+    /app/www/ --strip-components=1 && \
+  cd /app/www/server && \
   sed -i '/"extends": "..\/tsconfig.json"/d' tsconfig.json  && \  
   yarn --dev --frozen-lockfile && \
   yarn build && \
@@ -39,25 +36,22 @@ RUN \
   rm -rf \
     /tmp/*
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15 as client-buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:3.17 as client-buildstage
 
 ARG NODE_ENV
 ENV NODE_ENV ${NODE_ENV:-production}
 
-COPY --from=server-buildstage /app/your_spotify/client /app/your_spotify/client
+COPY --from=server-buildstage /app/www/client /app/www/client
 
 RUN \
   apk -U --update --no-cache add --virtual=client-build-dependencies \
     build-base \
     cmake \
-    gcc \
-    g++ \
-    make \
     npm \
     python3-dev \
     yarn && \
   echo "*** install your_spotify client ***" && \
-  cd /app/your_spotify/client && \
+  cd /app/www/client && \
   sed -i '/"extends": "..\/tsconfig.json"/d' tsconfig.json  && \  
   npm install -g nodemon && \
   yarn --production=false --frozen-lockfile --network-timeout 60000 && \
@@ -68,7 +62,7 @@ RUN \
   rm -rf \
     /tmp/*
 
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.15
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17
 
 ARG BUILD_DATE
 ARG VERSION
@@ -77,24 +71,21 @@ LABEL maintainer="thespad"
 
 ENV HOME=/app
 
-COPY --from=client-buildstage /app/your_spotify/client/build/ /app/your_spotify/client/build/
-COPY --from=server-buildstage /app/your_spotify/server/package.json /app/your_spotify/server/package.json
-COPY --from=server-buildstage /app/your_spotify/server/lib/ /app/your_spotify/server/lib/
+COPY --from=client-buildstage /app/www/client/build/ /app/www/client/build/
+COPY --from=server-buildstage /app/www/server/package.json /app/www/server/package.json
+COPY --from=server-buildstage /app/www/server/lib/ /app/www/server/lib/
 
 RUN \
   apk -U --update --no-cache add --virtual=build-dependencies \
     build-base \
     cmake \
-    gcc \
-    g++ \
     python3-dev && \
   apk add -U --update --no-cache \
-    curl \
     nodejs \
     npm \
     yarn && \
   npm install -g serve && \
-  cd /app/your_spotify/server && \
+  cd /app/www/server && \
   yarn --production && \
   yarn cache clean && \
   apk del --purge \

diff --git a/README.md b/README.md
@@ -246,4 +246,5 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **23.01.23:** - Rebase to Alpine 3.17, migrate to s6v3.
 * **23.02.22:** - Initial Release.
diff --git a/release-versions/alpine-nginx-master.txt b/release-versions/alpine-nginx-master.txt
diff --git a/root/app/your_spotify/client/build/index.html b/root/app/your_spotify/client/build/index.html
@@ -0,0 +1,40 @@
+<html>
+    <head>
+        <title>Upgrade Required!</title>
+        <style>
+        body{
+            font-family: Helvetica, Arial, sans-serif;
+        }
+        .message{
+            width:440px;
+            padding:20px 40px;
+            margin:0 auto;
+            background-color:#f9f9f9;
+            border:1px solid #ddd;
+            color: #1e3d62;
+        }
+        center{
+            margin:40px 0;
+        }
+        h1{
+            font-size: 18px;
+            line-height: 26px;
+        }
+        p{
+            font-size: 12px;
+        }
+        a{
+            color: rgb(207, 48, 139);
+        }
+        </style>
+    </head>
+    <body>
+        <div class="message">
+            <h1>Upgrade Required!</h1>
+            <p>The application inside this image has been moved to a new folder.</p>
+            <p>You will need to update your <strong>/config/nginx/nginx.conf</strong> and <strong>/config/nginx/site-confs/default.conf</strong> in order for the application to work.</p>
+            <p>New config samples are located at <strong>/config/nginx/nginx.conf.sample</strong> and <strong>/config/nginx/site-confs/default.conf.sample</strong></p>
+            <p>Please review our announcement: <a target="_blank" href="https://info.linuxserver.io/issues/2022-08-20-nginx-base/">Significant changes to nginx based images</a></p>
+        </div>
+    </body>
+</html>
diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample
@@ -3,7 +3,7 @@ server {
 
     listen 443 ssl;
 
-    root /app/your_spotify/client/build;
+    root /app/www/client/build;
     index index.php index.html index.htm;
 
     server_name _;

diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-your_spotify-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-your_spotify-config
diff --git a/root/etc/s6-overlay/s6-rc.d/init-your_spotify-config/dependencies.d/init-nginx-end b/root/etc/s6-overlay/s6-rc.d/init-your_spotify-config/dependencies.d/init-nginx-end
diff --git a/root/etc/cont-init.d/50-config → ...rlay/s6-rc.d/init-your_spotify-config/run b/root/etc/cont-init.d/50-config → ...rlay/s6-rc.d/init-your_spotify-config/run
@@ -1,21 +1,21 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
-VAR_PATH="/app/your_spotify/client/build"
+VAR_PATH="/app/www/client/build"
 
-cp "$VAR_PATH/variables.js" "$VAR_PATH/variables-final.js"
+cp "$VAR_PATH/variables-template.js" "$VAR_PATH/variables.js"
 
 export API_ENDPOINT="${APP_URL}/api"
 
-if [ -n "$API_ENDPOINT" ]
-then
+if [[ -n "$API_ENDPOINT" ]]; then
     echo "Setting API Endpoint to '$API_ENDPOINT'"
-    sed -i "s;__API_ENDPOINT__;$API_ENDPOINT;g" "$VAR_PATH/variables-final.js"
+    sed -i "s;__API_ENDPOINT__;$API_ENDPOINT;g" "$VAR_PATH/variables.js"
 else
     echo "API_ENDPOINT is not defined, web app won't work"
     exit 1
 fi
 
 HOME="/app"
 
-chown -R abc:abc \
+lsiown -R abc:abc \
     /app
diff --git a/root/etc/s6-overlay/s6-rc.d/init-your_spotify-config/type b/root/etc/s6-overlay/s6-rc.d/init-your_spotify-config/type
@@ -0,0 +1 @@
+oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/init-your_spotify-config/up b/root/etc/s6-overlay/s6-rc.d/init-your_spotify-config/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-your_spotify-config/run
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-your_spotify/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-your_spotify/dependencies.d/init-services
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-your_spotify/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-your_spotify/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-your_spotify/run b/root/etc/s6-overlay/s6-rc.d/svc-your_spotify/run
@@ -0,0 +1,11 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+export API_ENDPOINT="${APP_URL}/api"
+export CLIENT_ENDPOINT="${APP_URL}"
+
+s6-setuidgid abc yarn --cwd /app/www/server migrate
+
+exec \
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8000" \
+        cd /app/www/server s6-setuidgid abc yarn start
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-your_spotify/type b/root/etc/s6-overlay/s6-rc.d/svc-your_spotify/type
@@ -0,0 +1 @@
+longrun
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-your_spotify-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-your_spotify-config
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-your_spotify b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-your_spotify
diff --git a/root/etc/services.d/your_spotify_server/run b/root/etc/services.d/your_spotify_server/run
diff --git a/root/migrations/02-default-location b/root/migrations/02-default-location
@@ -0,0 +1,11 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+DEFAULT_CONF="/config/nginx/site-confs/default.conf"
+OLD_ROOT="root /app/your_spotify/client/build;"
+NEW_ROOT="root /app/www/client/build;"
+
+if grep -q "${OLD_ROOT}" "${DEFAULT_CONF}" 2>/dev/null; then
+    echo "updating root in ${DEFAULT_CONF}"
+    sed -i "s|${OLD_ROOT}|${NEW_ROOT}|" "${DEFAULT_CONF}"
+fi