Merge pull request #21 from linuxserver/3.17

Rebase to alpine 3.17 with php8.1

.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-nginx:3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17
 
 # set version label
 ARG BUILD_DATE
@@ -10,12 +12,11 @@ LABEL maintainer="aptalca"
 RUN \
  echo "**** install packages ****" && \
  apk add --no-cache \
- curl \
- php8-ctype \
- php8-gd \
- php8-mysqli \
- php8-pdo_pgsql \
- php8-pdo_sqlite && \
+ php81-ctype \
+ php81-gd \
+ php81-mysqli \
+ php81-pdo_pgsql \
+ php81-pdo_sqlite && \
  echo "**** install librespeed ****" && \
  if [ -z ${LIBRESPEED_RELEASE+x} ]; then \
  LIBRESPEED_RELEASE=$(curl -sX GET "https://api.github.com/repos/librespeed/speedtest/releases/latest" \

Dockerfile.aarch64

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -10,12 +12,11 @@ LABEL maintainer="aptalca"
 RUN \
  echo "**** install packages ****" && \
  apk add --no-cache \
- curl \
- php8-ctype \
- php8-gd \
- php8-mysqli \
- php8-pdo_pgsql \
- php8-pdo_sqlite && \
+ php81-ctype \
+ php81-gd \
+ php81-mysqli \
+ php81-pdo_pgsql \
+ php81-pdo_sqlite && \
  echo "**** install librespeed ****" && \
  if [ -z ${LIBRESPEED_RELEASE+x} ]; then \
  LIBRESPEED_RELEASE=$(curl -sX GET "https://api.github.com/repos/librespeed/speedtest/releases/latest" \

Dockerfile.armhf

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -10,12 +12,11 @@ LABEL maintainer="aptalca"
 RUN \
  echo "**** install packages ****" && \
  apk add --no-cache \
- curl \
- php8-ctype \
- php8-gd \
- php8-mysqli \
- php8-pdo_pgsql \
- php8-pdo_sqlite && \
+ php81-ctype \
+ php81-gd \
+ php81-mysqli \
+ php81-pdo_pgsql \
+ php81-pdo_sqlite && \
  echo "**** install librespeed ****" && \
  if [ -z ${LIBRESPEED_RELEASE+x} ]; then \
  LIBRESPEED_RELEASE=$(curl -sX GET "https://api.github.com/repos/librespeed/speedtest/releases/latest" \

Jenkinsfile

@@ -464,7 +464,7 @@ pipeline {
  --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
  --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
  --label \"org.opencontainers.image.title=Librespeed\" \
- --label \"org.opencontainers.image.description=[Librespeed](https://github.com/librespeed/speedtest) is a very lightweight Speedtest implemented in Javascript, using XMLHttpRequest and Web Workers. No Flash, No Java, No Websocket, No Bullshit.\" \
+ --label \"org.opencontainers.image.description=[Librespeed](https://github.com/librespeed/speedtest) is a very lightweight Speedtest implemented in Javascript, using XMLHttpRequest and Web Workers.  No Flash, No Java, No Websocket, No Bullshit. \" \
  --no-cache --pull -t ${IMAGE}:${META_TAG} \
  --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
  }
@@ -494,7 +494,7 @@ pipeline {
  --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
  --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
  --label \"org.opencontainers.image.title=Librespeed\" \
- --label \"org.opencontainers.image.description=[Librespeed](https://github.com/librespeed/speedtest) is a very lightweight Speedtest implemented in Javascript, using XMLHttpRequest and Web Workers. No Flash, No Java, No Websocket, No Bullshit.\" \
+ --label \"org.opencontainers.image.description=[Librespeed](https://github.com/librespeed/speedtest) is a very lightweight Speedtest implemented in Javascript, using XMLHttpRequest and Web Workers.  No Flash, No Java, No Websocket, No Bullshit. \" \
  --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \
  --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
  }
@@ -521,7 +521,7 @@ pipeline {
  --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
  --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
  --label \"org.opencontainers.image.title=Librespeed\" \
- --label \"org.opencontainers.image.description=[Librespeed](https://github.com/librespeed/speedtest) is a very lightweight Speedtest implemented in Javascript, using XMLHttpRequest and Web Workers. No Flash, No Java, No Websocket, No Bullshit.\" \
+ --label \"org.opencontainers.image.description=[Librespeed](https://github.com/librespeed/speedtest) is a very lightweight Speedtest implemented in Javascript, using XMLHttpRequest and Web Workers.  No Flash, No Java, No Websocket, No Bullshit. \" \
  --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
  --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
  sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
@@ -555,7 +555,7 @@ pipeline {
  --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
  --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
  --label \"org.opencontainers.image.title=Librespeed\" \
- --label \"org.opencontainers.image.description=[Librespeed](https://github.com/librespeed/speedtest) is a very lightweight Speedtest implemented in Javascript, using XMLHttpRequest and Web Workers. No Flash, No Java, No Websocket, No Bullshit.\" \
+ --label \"org.opencontainers.image.description=[Librespeed](https://github.com/librespeed/speedtest) is a very lightweight Speedtest implemented in Javascript, using XMLHttpRequest and Web Workers.  No Flash, No Java, No Websocket, No Bullshit. \" \
  --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
  --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
  sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"

README.md

@@ -41,6 +41,7 @@ Find us at:
 [![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Flibrespeed%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/librespeed/latest/index.html)
 
 [Librespeed](https://github.com/librespeed/speedtest) is a very lightweight Speedtest implemented in Javascript, using XMLHttpRequest and Web Workers.
+
 No Flash, No Java, No Websocket, No Bullshit.
 
 [![librespeed](https://raw.githubusercontent.com/librespeed/speedtest/master/.logo/logo3.png)](https://github.com/librespeed/speedtest)
@@ -254,6 +255,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **20.01.23:** - Rebase to alpine 3.17 with php8.1.
 * **20.08.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
 * **01.03.21:** - Fix up database settings. Make sure `index.html` is recreated.
 * **28.02.21:** - Added php7-ctype.

readme-vars.yml

@@ -4,9 +4,10 @@
 project_name: librespeed
 project_url: "https://github.com/librespeed/speedtest"
 project_logo: "https://raw.githubusercontent.com/librespeed/speedtest/master/.logo/logo3.png"
-project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is a very lightweight Speedtest implemented in Javascript, using XMLHttpRequest and Web Workers.
- 
-No Flash, No Java, No Websocket, No Bullshit."
+project_blurb: |
+ [{{ project_name|capitalize }}]({{ project_url }}) is a very lightweight Speedtest implemented in Javascript, using XMLHttpRequest and Web Workers.
+
+ No Flash, No Java, No Websocket, No Bullshit.
 project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
 
 # supported architectures
@@ -63,6 +64,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+ - { date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1." }
  - { date: "20.08.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }
  - { date: "01.03.21:", desc: "Fix up database settings. Make sure `index.html` is recreated." }
  - { date: "28.02.21:", desc: "Added php7-ctype." }

root/defaults/www/index.html

@@ -349,4 +349,4 @@ <h4>Data removal</h4>
 </div>
 <script type="text/javascript">setTimeout(function(){initUI()},100);</script>
 </body>
-</html>
+</html>

root/etc/cont-init.d/50-config → root/etc/s6-overlay/s6-rc.d/init-librespeed-config/run

@@ -3,7 +3,6 @@
 
 # make our folders
 mkdir -p \
- /config/www \
  /config/www/img
 
 # create symlink to index.html
@@ -61,7 +60,5 @@ else
 fi
 
 # permissions
-echo "Setting permissions"
-chown -R abc:abc \
- /app/www/public \
+lsiown -R abc:abc \
  /config

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

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

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

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