Merge pull request #421 from linuxserver/code-server-php8-s6v3

switch to hybrid (code-server-php8)

README.md

@@ -1,7 +1,7 @@
-# PHP8 - Docker mod for code-server
+# PHP8 - Docker mod for code-server/openvscode-server
 
-This mod adds php8.0 and composer to code-server, to be installed/updated during container start.
+This mod adds php8.0 and composer to code-server/openvscode-server, to be installed/updated during container start.
 
-In code-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-php8`
+In code-server/openvscode-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-php8`
 
 If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:code-server-php8|linuxserver/mods:code-server-mod2`

root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/run

@@ -0,0 +1,22 @@
+#!/usr/bin/with-contenv bash
+
+source /etc/lsb-release
+if [ "${DISTRIB_CODENAME}" = "bionic" ] || [ "${DISTRIB_CODENAME}" = "focal" ]; then
+    if ! dpkg -l | grep gnupg > /dev/null; then
+        apt-get update && apt-get install -y --no-install-recommends gnupg
+    fi
+    if [ ! -f "/etc/apt/sources.list.d/php8source.list" ]; then
+        apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 14aa40ec0831756756d7f66c4f4ea0aae5267a6c
+        echo "deb https://ppa.launchpadcontent.net/ondrej/php/ubuntu ${DISTRIB_CODENAME} main" \
+            > /etc/apt/sources.list.d/php8source.list
+        echo "**** Adding php8.1 and composer to package install list ****"
+        echo "\
+            php8.1 \
+            composer" >> /mod-repo-packages-to-install.list
+    fi
+elif ! dpkg -l | grep php > /dev/null || ! dpkg -l | grep composer > /dev/null; then
+    echo "**** Adding php and composer to package install list ****"
+    echo "\
+        php \
+        composer" >> /mod-repo-packages-to-install.list
+fi

root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/type

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

root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/run