From a345eb8a9f6e021395880b07782a592063842b21 Mon Sep 17 00:00:00 2001
From: RoboMagus <68224306+RoboMagus@users.noreply.github.com>
Date: Mon, 8 Nov 2021 13:58:37 +0100
Subject: [PATCH 1/5] DockerMod to allow installation of code-server extensions
 by providing a list of extensions to install through environment variable

---
 .github/workflows/BuildImage.yml           |  4 ++--
 Dockerfile                                 |  2 +-
 Dockerfile.complex                         | 23 ------------------
 README.md                                  | 22 ++++++------------
 root/etc/cont-init.d/98-vpn-config         | 27 ----------------------
 root/etc/cont-init.d/99-install-extensions | 15 ++++++++++++
 root/etc/services.d/sshvpn/run             |  3 ---
 7 files changed, 25 insertions(+), 71 deletions(-)
 delete mode 100644 Dockerfile.complex
 delete mode 100644 root/etc/cont-init.d/98-vpn-config
 create mode 100644 root/etc/cont-init.d/99-install-extensions
 delete mode 100644 root/etc/services.d/sshvpn/run

diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml
index 518b0d8..0e0fe38 100644
--- a/.github/workflows/BuildImage.yml
+++ b/.github/workflows/BuildImage.yml
@@ -4,8 +4,8 @@ on: [push, pull_request, workflow_dispatch]
 
 env:
   ENDPOINT: "linuxserver/mods" #don't modify
-  BASEIMAGE: "replace_baseimage" #replace
-  MODNAME: "replace_modname" #replace
+  BASEIMAGE: "code-server" #replace
+  MODNAME: "extension-arguments" #replace
 
 jobs:
   build:
diff --git a/Dockerfile b/Dockerfile
index 4ece5e8..44f7e81 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM scratch
 
-LABEL maintainer="username"
+LABEL maintainer="robomagus"
 
 # copy local files
 COPY root/ /
diff --git a/Dockerfile.complex b/Dockerfile.complex
deleted file mode 100644
index db4598e..0000000
--- a/Dockerfile.complex
+++ /dev/null
@@ -1,23 +0,0 @@
-## Buildstage ##
-FROM ghcr.io/linuxserver/baseimage-alpine:3.12 as buildstage
-
-RUN \
- echo "**** install packages ****" && \
- apk add --no-cache \
-	curl && \
- echo "**** grab rclone ****" && \
- mkdir -p /root-layer && \
- curl -o \
-	/root-layer/rclone.deb -L \
-	"https://downloads.rclone.org/v1.47.0/rclone-v1.47.0-linux-amd64.deb"
-
-# copy local files
-COPY root/ /root-layer/
-
-## Single layer deployed image ##
-FROM scratch
-
-LABEL maintainer="username"
-
-# Add files from buildstage
-COPY --from=buildstage /root-layer/ /
diff --git a/README.md b/README.md
index 5636dec..51d0c36 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,9 @@
-# Rsync - Docker mod for openssh-server
+# Extension Arguments - Docker mod for code-server
 
-This mod adds rsync to openssh-server, to be installed/updated during container start.
+This mod installs code-server extensions at startup. The list of extensions to be installed should be provided using environment variable `VSCODE_EXTENSION_IDS` separated by `|`.
 
-In openssh-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:openssh-server-rsync`
-
-If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:openssh-server-rsync|linuxserver/mods:openssh-server-mod2`
-
-# Mod creation instructions
-
-* Fork the repo, create a new branch based on the branch `template`.
-* Edit the `Dockerfile` for the mod. `Dockerfile.complex` is only an example and included for reference; it should be deleted when done.
-* Inspect the `root` folder contents. Edit, add and remove as necessary.
-* Edit this readme with pertinent info, delete these instructions.
-* Finally edit the `.github/workflows/BuildImage.yml`. Customize the build branch, and the vars for `BASEIMAGE` and `MODNAME`.
-* Ask the team to create a new branch named `<baseimagename>-<modname>`. Baseimage should be the name of the image the mod will be applied to. The new branch will be based on the `template` branch.
-* Submit PR against the branch created by the team.
+For example, to install the `vscode-docker` and `vscode-icons` extensions add the following lines to your docker compose service:
+```yaml
+- DOCKER_MODS=linuxserver/mods:code-server-docker|linuxserver/mods:code-server-extension-arguments
+- VSCODE_EXTENSION_IDS=vscode-icons-team.vscode-icons|ms-azuretools.vscode-docker
+```
diff --git a/root/etc/cont-init.d/98-vpn-config b/root/etc/cont-init.d/98-vpn-config
deleted file mode 100644
index a5f9127..0000000
--- a/root/etc/cont-init.d/98-vpn-config
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# Determine if setup is needed
-if [ ! -f /usr/local/lib/python***/dist-packages/sshuttle ] && \
-[ -f /usr/bin/apt ]; then
-  ## Ubuntu
-  apt-get update
-  apt-get install --no-install-recommends -y \
-    iptables \
-    openssh-client \
-    python3 \
-    python3-pip 
-  pip3 install sshuttle
-fi
-if [ ! -f /usr/lib/python***/site-packages/sshuttle ] && \
-[ -f /sbin/apk ]; then
-  # Alpine
-  apk add --no-cache \
-    iptables \
-    openssh \
-    py3-pip \
-    python3 
-  pip3 install sshuttle
-fi
-
-chown -R root:root /root
-chmod -R 600 /root/.ssh
diff --git a/root/etc/cont-init.d/99-install-extensions b/root/etc/cont-init.d/99-install-extensions
new file mode 100644
index 0000000..f733f05
--- /dev/null
+++ b/root/etc/cont-init.d/99-install-extensions
@@ -0,0 +1,15 @@
+#!/usr/bin/with-contenv bash
+
+# Exit if no VsCode extensions are given
+if [ -z ${VSCODE_EXTENSION_IDS+x} ]; then
+  echo "**** No VSCODE EXTENSIONS GIVEN****"
+  exit 0
+fi
+
+
+IFS='|'
+VSCODE_EXTENSION_IDS=(${VSCODE_EXTENSION_IDS})
+for ID in "${VSCODE_EXTENSION_IDS[@]}"; do
+    echo "**** installing extension: ${ID} ****"
+    code-server --user-data-dir /config/data --extensions-dir /config/extensions --install-extension ${ID}
+done
\ No newline at end of file
diff --git a/root/etc/services.d/sshvpn/run b/root/etc/services.d/sshvpn/run
deleted file mode 100644
index 7d49e79..0000000
--- a/root/etc/services.d/sshvpn/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-sshuttle --dns --remote root@${HOST}:${PORT} 0/0 -x 172.17.0.0/16

From 7ca966a8ad4120deb89a6087d2e088e715f7dff3 Mon Sep 17 00:00:00 2001
From: RoboMagus <68224306+RoboMagus@users.noreply.github.com>
Date: Tue, 14 Dec 2021 11:39:29 +0100
Subject: [PATCH 2/5] Docker mod for installing Subversion + SVN extension into
 code-server container.

---
 .github/workflows/BuildImage.yml           |  2 +-
 README.md                                  | 12 +++++-------
 root/etc/cont-init.d/98-subversion         |  6 ++++++
 root/etc/cont-init.d/99-install-extensions | 15 ---------------
 root/etc/cont-init.d/99-svn-extension      |  4 ++++
 5 files changed, 16 insertions(+), 23 deletions(-)
 create mode 100644 root/etc/cont-init.d/98-subversion
 delete mode 100644 root/etc/cont-init.d/99-install-extensions
 create mode 100644 root/etc/cont-init.d/99-svn-extension

diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml
index 0e0fe38..8316ec8 100644
--- a/.github/workflows/BuildImage.yml
+++ b/.github/workflows/BuildImage.yml
@@ -5,7 +5,7 @@ on: [push, pull_request, workflow_dispatch]
 env:
   ENDPOINT: "linuxserver/mods" #don't modify
   BASEIMAGE: "code-server" #replace
-  MODNAME: "extension-arguments" #replace
+  MODNAME: "svn" #replace
 
 jobs:
   build:
diff --git a/README.md b/README.md
index 51d0c36..4553221 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,7 @@
-# Extension Arguments - Docker mod for code-server
+# SVN - Docker mod for code-server
 
-This mod installs code-server extensions at startup. The list of extensions to be installed should be provided using environment variable `VSCODE_EXTENSION_IDS` separated by `|`.
+This mod installs subversion and the SVN extension into code-server at startup.
 
-For example, to install the `vscode-docker` and `vscode-icons` extensions add the following lines to your docker compose service:
-```yaml
-- DOCKER_MODS=linuxserver/mods:code-server-docker|linuxserver/mods:code-server-extension-arguments
-- VSCODE_EXTENSION_IDS=vscode-icons-team.vscode-icons|ms-azuretools.vscode-docker
-```
+In code-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`
diff --git a/root/etc/cont-init.d/98-subversion b/root/etc/cont-init.d/98-subversion
new file mode 100644
index 0000000..8549a44
--- /dev/null
+++ b/root/etc/cont-init.d/98-subversion
@@ -0,0 +1,6 @@
+#!/usr/bin/with-contenv bash
+
+apt-get update
+
+echo "**** installing subversion ****"
+apt-get install -y subversion
diff --git a/root/etc/cont-init.d/99-install-extensions b/root/etc/cont-init.d/99-install-extensions
deleted file mode 100644
index f733f05..0000000
--- a/root/etc/cont-init.d/99-install-extensions
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# Exit if no VsCode extensions are given
-if [ -z ${VSCODE_EXTENSION_IDS+x} ]; then
-  echo "**** No VSCODE EXTENSIONS GIVEN****"
-  exit 0
-fi
-
-
-IFS='|'
-VSCODE_EXTENSION_IDS=(${VSCODE_EXTENSION_IDS})
-for ID in "${VSCODE_EXTENSION_IDS[@]}"; do
-    echo "**** installing extension: ${ID} ****"
-    code-server --user-data-dir /config/data --extensions-dir /config/extensions --install-extension ${ID}
-done
\ No newline at end of file
diff --git a/root/etc/cont-init.d/99-svn-extension b/root/etc/cont-init.d/99-svn-extension
new file mode 100644
index 0000000..6237e76
--- /dev/null
+++ b/root/etc/cont-init.d/99-svn-extension
@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv bash
+
+echo "**** installing SVN extension ****"
+s6-setuidgid abc code-server --user-data-dir /config/data --extensions-dir /config/extensions --install-extension johnstoncode.svn-scm
\ No newline at end of file

From 8548048831757da7ddd0a524aba5e12ed538fe08 Mon Sep 17 00:00:00 2001
From: RoboMagus <68224306+RoboMagus@users.noreply.github.com>
Date: Wed, 15 Dec 2021 09:05:20 +0100
Subject: [PATCH 3/5] Merged init files.

---
 root/etc/cont-init.d/98-subversion    | 3 +++
 root/etc/cont-init.d/99-svn-extension | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)
 delete mode 100644 root/etc/cont-init.d/99-svn-extension

diff --git a/root/etc/cont-init.d/98-subversion b/root/etc/cont-init.d/98-subversion
index 8549a44..7db3aa7 100644
--- a/root/etc/cont-init.d/98-subversion
+++ b/root/etc/cont-init.d/98-subversion
@@ -4,3 +4,6 @@ apt-get update
 
 echo "**** installing subversion ****"
 apt-get install -y subversion
+
+echo "**** installing SVN extension ****"
+s6-setuidgid abc code-server --user-data-dir /config/data --extensions-dir /config/extensions --install-extension johnstoncode.svn-scm
\ No newline at end of file
diff --git a/root/etc/cont-init.d/99-svn-extension b/root/etc/cont-init.d/99-svn-extension
deleted file mode 100644
index 6237e76..0000000
--- a/root/etc/cont-init.d/99-svn-extension
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-echo "**** installing SVN extension ****"
-s6-setuidgid abc code-server --user-data-dir /config/data --extensions-dir /config/extensions --install-extension johnstoncode.svn-scm
\ No newline at end of file

From f9e9539562a63f48399d70614c33296998cd2cf9 Mon Sep 17 00:00:00 2001
From: RoboMagus <68224306+RoboMagus@users.noreply.github.com>
Date: Sun, 2 Jan 2022 10:36:37 +0100
Subject: [PATCH 4/5] Rework based on review comments

---
 root/etc/cont-init.d/95-apt-get    | 3 +++
 root/etc/cont-init.d/98-subversion | 5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 root/etc/cont-init.d/95-apt-get

diff --git a/root/etc/cont-init.d/95-apt-get b/root/etc/cont-init.d/95-apt-get
new file mode 100644
index 0000000..db78fc6
--- /dev/null
+++ b/root/etc/cont-init.d/95-apt-get
@@ -0,0 +1,3 @@
+#!/usr/bin/with-contenv bash
+
+apt-get update
\ No newline at end of file
diff --git a/root/etc/cont-init.d/98-subversion b/root/etc/cont-init.d/98-subversion
index 7db3aa7..66a1772 100644
--- a/root/etc/cont-init.d/98-subversion
+++ b/root/etc/cont-init.d/98-subversion
@@ -1,9 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-apt-get update
-
 echo "**** installing subversion ****"
 apt-get install -y subversion
 
-echo "**** installing SVN extension ****"
-s6-setuidgid abc code-server --user-data-dir /config/data --extensions-dir /config/extensions --install-extension johnstoncode.svn-scm
\ No newline at end of file
+install-extension johnstoncode.svn-scm
\ No newline at end of file

From 10eff071f15f0a855dabc0047ecd4e2575d9e64e Mon Sep 17 00:00:00 2001
From: RoboMagus <68224306+RoboMagus@users.noreply.github.com>
Date: Thu, 6 Jan 2022 22:04:57 +0100
Subject: [PATCH 5/5] fix new-line at end of init files

---
 root/etc/cont-init.d/95-apt-get    | 2 +-
 root/etc/cont-init.d/98-subversion | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/root/etc/cont-init.d/95-apt-get b/root/etc/cont-init.d/95-apt-get
index db78fc6..ad08ae8 100644
--- a/root/etc/cont-init.d/95-apt-get
+++ b/root/etc/cont-init.d/95-apt-get
@@ -1,3 +1,3 @@
 #!/usr/bin/with-contenv bash
 
-apt-get update
\ No newline at end of file
+apt-get update
diff --git a/root/etc/cont-init.d/98-subversion b/root/etc/cont-init.d/98-subversion
index 66a1772..3f7d429 100644
--- a/root/etc/cont-init.d/98-subversion
+++ b/root/etc/cont-init.d/98-subversion
@@ -3,4 +3,4 @@
 echo "**** installing subversion ****"
 apt-get install -y subversion
 
-install-extension johnstoncode.svn-scm
\ No newline at end of file
+install-extension johnstoncode.svn-scm