From 128c056cbf81933d46003f0644e4941e87e5ab9c Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 3 Aug 2022 12:32:08 -0400 Subject: [PATCH] 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