-
-
Notifications
You must be signed in to change notification settings - Fork 284
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #959 from howardt12345/code-server-python3poetry
code-server: python3-poetry initial release
- Loading branch information
Showing
24 changed files
with
38 additions
and
107 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
|
||
FROM scratch | ||
|
||
LABEL maintainer="username" | ||
LABEL maintainer="howardt12345" | ||
|
||
# copy local files | ||
COPY root/ / |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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` |
File renamed without changes.
14 changes: 14 additions & 0 deletions
14
root/etc/s6-overlay/s6-rc.d/init-mod-code-server-python3-poetry-add-package/run
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
File renamed without changes.
1 change: 1 addition & 0 deletions
1
root/etc/s6-overlay/s6-rc.d/init-mod-code-server-python3-poetry-add-package/up
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
/etc/s6-overlay/s6-rc.d/init-mod-code-server-python3-poetry-add-package/run |
File renamed without changes.
14 changes: 14 additions & 0 deletions
14
root/etc/s6-overlay/s6-rc.d/init-mod-code-server-python3-poetry-install/run
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 ****" |
File renamed without changes.
1 change: 1 addition & 0 deletions
1
root/etc/s6-overlay/s6-rc.d/init-mod-code-server-python3-poetry-install/up
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
/etc/s6-overlay/s6-rc.d/init-mod-code-server-python3-poetry-install/run |
30 changes: 0 additions & 30 deletions
30
root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/run
This file was deleted.
Oops, something went wrong.
1 change: 0 additions & 1 deletion
1
root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-add-package/up
This file was deleted.
Oops, something went wrong.
8 changes: 0 additions & 8 deletions
8
root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/run
This file was deleted.
Oops, something went wrong.
1 change: 0 additions & 1 deletion
1
root/etc/s6-overlay/s6-rc.d/init-mod-imagename-modname-install/up
This file was deleted.
Oops, something went wrong.
File renamed without changes.
File renamed without changes.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
File renamed without changes.
File renamed without changes.
Empty file.
Empty file.