From e4ae8c0f26099b180266c4e340511e51d06073f9 Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 10 Aug 2022 16:27:39 -0400 Subject: [PATCH 1/2] switch to hybrid --- .../dependencies.d/init-mods | 0 .../s6-rc.d/init-mod-code-server-svn-add-package/run | 8 ++++++++ .../s6-rc.d/init-mod-code-server-svn-add-package/type | 1 + .../s6-rc.d/init-mod-code-server-svn-add-package/up | 1 + .../dependencies.d/init-mods-package-install | 0 .../s6-rc.d/init-mod-code-server-svn-install/run | 3 +++ .../s6-rc.d/init-mod-code-server-svn-install/type | 1 + .../s6-rc.d/init-mod-code-server-svn-install/up | 1 + .../dependencies.d/init-mod-code-server-svn-install | 0 .../dependencies.d/init-mod-code-server-svn-add-package | 0 .../user/contents.d/init-mod-code-server-svn-add-package | 0 .../user/contents.d/init-mod-code-server-svn-install | 0 12 files changed, 15 insertions(+) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-add-package/dependencies.d/init-mods create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-add-package/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-add-package/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-add-package/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-install/dependencies.d/init-mods-package-install create mode 100755 root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-install/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-install/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-install/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-code-server-svn-install create mode 100644 root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-code-server-svn-add-package create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-code-server-svn-add-package create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-code-server-svn-install diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-add-package/dependencies.d/init-mods b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-add-package/dependencies.d/init-mods new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-add-package/run b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-add-package/run new file mode 100755 index 0000000..681ade5 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-add-package/run @@ -0,0 +1,8 @@ +#!/usr/bin/with-contenv bash + +if ! dpkg -s subversion >/dev/null 2>&1; then + echo "**** Adding subversion to package install list ****" + echo "subversion" >> /mod-repo-packages-to-install.list +else + echo "**** subversion already installed, skipping ****" +fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-add-package/type b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-add-package/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-add-package/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-add-package/up b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-add-package/up new file mode 100644 index 0000000..e8e479f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-add-package/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-add-package/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-install/dependencies.d/init-mods-package-install b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-install/dependencies.d/init-mods-package-install new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-install/run b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-install/run new file mode 100755 index 0000000..73af068 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-install/run @@ -0,0 +1,3 @@ +#!/usr/bin/with-contenv bash + +install-extension johnstoncode.svn-scm diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-install/type b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-install/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-install/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-install/up b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-install/up new file mode 100644 index 0000000..8b14a93 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-install/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-mod-code-server-svn-install/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-code-server-svn-install b/root/etc/s6-overlay/s6-rc.d/init-mods-end/dependencies.d/init-mod-code-server-svn-install new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-code-server-svn-add-package b/root/etc/s6-overlay/s6-rc.d/init-mods-package-install/dependencies.d/init-mod-code-server-svn-add-package new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-code-server-svn-add-package b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-code-server-svn-add-package new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-code-server-svn-install b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-mod-code-server-svn-install new file mode 100644 index 0000000..e69de29 From b850736a5dbc4c9a5704836b8d976dd30caead8f Mon Sep 17 00:00:00 2001 From: aptalca Date: Wed, 10 Aug 2022 16:39:20 -0400 Subject: [PATCH 2/2] update readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4553221..6dc2655 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -# SVN - Docker mod for code-server +# SVN - Docker mod for code-server/openvscode-server -This mod installs subversion and the SVN extension into code-server at startup. +This mod installs subversion and the SVN extension into code-server/openvscode-server at startup. -In code-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-svn` +In code-server/openvscode-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-svn` If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:code-server-python3|linuxserver/mods:code-server-svn`