From 128c056cbf81933d46003f0644e4941e87e5ab9c Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 3 Aug 2022 12:32:08 -0400 Subject: [PATCH 1/4] switch to hybrid --- .../init-mod-code-server-php8-add-package | 0 .../dependencies.d/init-mods | 0 .../mod-init-code-server-php8-add-package/run | 25 +++++++++++++++++++ .../type | 1 + .../mod-init-code-server-php8-add-package/up | 1 + .../mod-init-code-server-php8-add-package | 0 6 files changed, 27 insertions(+) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-code-server-php8-add-package create mode 100644 root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/dependencies.d/init-mods create mode 100755 root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/run create mode 100644 root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/type create mode 100644 root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/up create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/mod-init-code-server-php8-add-package diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-code-server-php8-add-package b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-code-server-php8-add-package new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/dependencies.d/init-mods new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/run b/root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/run new file mode 100755 index 0000000..73e60b7 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/run @@ -0,0 +1,25 @@ +#!/usr/bin/with-contenv bash + +echo "**** installing nodejs dev environment ****" + + +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 diff --git a/root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/type b/root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/up b/root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/up new file mode 100644 index 0000000..ac00903 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/mod-init-code-server-php8-add-package b/root/etc/s6-overlay/s6-rc.d/user/contents.d/mod-init-code-server-php8-add-package new file mode 100644 index 0000000..e69de29 From 917ffce955f46aaf85c0ebd3ba378b60ec9c08ab Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 10 Aug 2022 16:42:18 -0400 Subject: [PATCH 2/4] update readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f4677f4..4743fb6 100644 --- a/README.md +++ b/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` \ No newline at end of file From fc988dceda396c21bd7e3081b106bd8130137af5 Mon Sep 17 00:00:00 2001 From: aptalca Date: Sun, 4 Sep 2022 17:29:49 -0400 Subject: [PATCH 3/4] fix typos --- .../dependencies.d/init-mods | 0 .../run | 0 .../type | 0 .../up | 0 ...ver-php8-add-package => init-mod-code-server-php8-add-package} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename root/etc/s6-overlay/s6-rc.d/{mod-init-code-server-php8-add-package => init-mod-code-server-php8-add-package}/dependencies.d/init-mods (100%) rename root/etc/s6-overlay/s6-rc.d/{mod-init-code-server-php8-add-package => init-mod-code-server-php8-add-package}/run (100%) rename root/etc/s6-overlay/s6-rc.d/{mod-init-code-server-php8-add-package => init-mod-code-server-php8-add-package}/type (100%) rename root/etc/s6-overlay/s6-rc.d/{mod-init-code-server-php8-add-package => init-mod-code-server-php8-add-package}/up (100%) rename root/etc/s6-overlay/s6-rc.d/user/contents.d/{mod-init-code-server-php8-add-package => init-mod-code-server-php8-add-package} (100%) diff --git a/root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/dependencies.d/init-mods similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/dependencies.d/init-mods rename to root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/dependencies.d/init-mods diff --git a/root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/run similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/run rename to root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/run diff --git a/root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/type b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/type similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/type rename to root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/type diff --git a/root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/up similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/mod-init-code-server-php8-add-package/up rename to root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/up diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/mod-init-code-server-php8-add-package b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-code-server-php8-add-package similarity index 100% rename from root/etc/s6-overlay/s6-rc.d/user/contents.d/mod-init-code-server-php8-add-package rename to root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-code-server-php8-add-package From 5f3951f01790d3c192c0031bf16e66da3da81001 Mon Sep 17 00:00:00 2001 From: aptalca Date: Sun, 4 Sep 2022 21:18:25 -0400 Subject: [PATCH 4/4] remove copy/pasta error comment --- .../s6-rc.d/init-mod-code-server-php8-add-package/run | 3 --- 1 file changed, 3 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/run index 73e60b7..a9b0390 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-php8-add-package/run @@ -1,8 +1,5 @@ #!/usr/bin/with-contenv bash -echo "**** installing nodejs dev environment ****" - - source /etc/lsb-release if [ "${DISTRIB_CODENAME}" = "bionic" ] || [ "${DISTRIB_CODENAME}" = "focal" ]; then if ! dpkg -l | grep gnupg > /dev/null; then