Merge pull request #959 from howardt12345/code-server-python3poetry

code-server: python3-poetry initial release

Author: aptalca

.github/workflows/BuildImage.yml

@@ -12,10 +12,10 @@ on:
 env:
   GITHUB_REPO: "linuxserver/docker-mods" #don't modify
   ENDPOINT: "linuxserver/mods" #don't modify
-  BASEIMAGE: "replace_baseimage" #replace
-  MODNAME: "replace_modname" #replace
+  BASEIMAGE: "code-server" #replace
+  MODNAME: "python3-poetry" #replace
   MOD_VERSION: ${{ inputs.mod_version }} #don't modify
-  MULTI_ARCH: "true" #set to false if not needed
+  MULTI_ARCH: "false"
 
 jobs:
   set-vars:

Dockerfile

@@ -2,7 +2,7 @@
 
 FROM scratch
 
-LABEL maintainer="username"
+LABEL maintainer="howardt12345"
 
 # copy local files
 COPY root/ /

Dockerfile.complex

@@ -1,25 +1,7 @@
-# Rsync - Docker mod for openssh-server
+# Python3 + Poetry - Docker mod for code-server/openvscode-server
 
-This mod adds rsync to openssh-server, to be installed/updated during container start.
+This mod adds a python3 dev environment to code-server/openvscode-server, to be installed/updated during container start, setting up a python3 environment with poetry.
 
-In openssh-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:openssh-server-rsync`
+In code-server/openvscode-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-python3-poetry`
 
-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.
-* After all init scripts and services are created, run `find ./  -path "./.git" -prune -o \( -name "run" -o -name "finish" -o -name "check" \) -not -perm -u=x,g=x,o=x -print -exec chmod +x {} +` to fix permissions.
-* Edit this readme with pertinent info, delete these instructions.
-* Finally edit the `.github/workflows/BuildImage.yml`. Customize the vars for `BASEIMAGE` and `MODNAME`. Set the versioning logic and `MULTI_ARCH` if needed.
-* 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.
-
-
-## Tips and tricks
-
-* Some images have helpers built in, these images are currently:
-    * [Openvscode-server](https://github.com/linuxserver/docker-openvscode-server/pull/10/files)
-    * [Code-server](https://github.com/linuxserver/docker-code-server/pull/95)
+If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:code-server-python3-poetry|linuxserver/mods:code-server-mod2`

README.md

@@ -0,0 +1,14 @@
+#!/usr/bin/with-contenv bash
+
+if ! dpkg -l | grep python3-dev > /dev/null; then
+    echo "**** Adding python3 to package install list ****"
+    echo "\
+        build-essential \
+        libssl-dev \
+        libffi-dev \
+        python3-dev \
+        python3-pip \
+        python3-venv" >> /mod-repo-packages-to-install.list
+else
+    echo "**** python3 already installed ****"
+fi

root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/dependencies.d/init-mods root/etc/s6-overlay/s6-rc.d/init-mod-code-server-python3-poetry-add-package/dependencies.d/init-mods

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

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

@@ -0,0 +1,14 @@
+#!/usr/bin/with-contenv bash
+
+echo "**** Setting up poetry ****"
+
+# Install poetry
+curl -sSL https://install.python-poetry.org | python3 -
+
+# Add poetry to the path
+echo "**** ensuring poetry is in PATH ****"
+if ! grep -q "$HOME/.local/bin" /var/run/s6/container_environment/PATH; then
+    printf ':$HOME/.local/bin' >> /var/run/s6/container_environment/PATH
+fi
+
+echo "**** poetry setup complete ****"

root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/type root/etc/s6-overlay/s6-rc.d/init-mod-code-server-python3-poetry-add-package/type

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-mod-code-server-python3-poetry-install/run