From 5a8f05000cf8c73f26f83a107b70e360c9676802 Mon Sep 17 00:00:00 2001 From: Chris Caplan Date: Sat, 6 Mar 2021 16:15:16 +0000 Subject: [PATCH 1/3] now based of template branch --- .github/workflows/BuildImage.yml | 4 ++-- Dockerfile | 2 +- Dockerfile.complex | 23 --------------------- README.md | 8 ++++---- root/etc/cont-init.d/98-aws-cli-install | 19 +++++++++++++++++ root/etc/cont-init.d/98-vpn-config | 27 ------------------------- root/etc/services.d/sshvpn/run | 3 --- 7 files changed, 26 insertions(+), 60 deletions(-) delete mode 100644 Dockerfile.complex create mode 100644 root/etc/cont-init.d/98-aws-cli-install delete mode 100644 root/etc/cont-init.d/98-vpn-config delete mode 100644 root/etc/services.d/sshvpn/run diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml index 518b0d8..6a92474 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: "awscli" #replace jobs: build: diff --git a/Dockerfile b/Dockerfile index 4ece5e8..582ac13 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM scratch -LABEL maintainer="username" +LABEL maintainer="capps1994" # 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..becc76e 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# Rsync - Docker mod for openssh-server +# AWSCLI - Docker mod for code-server -This mod adds rsync to openssh-server, to be installed/updated during container start. +This mod adds AWSCLI to code-server, to be installed/updated during container start. -In openssh-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:openssh-server-rsync` +In openssh-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-awscli` -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` +If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:code-server-awscli|linuxserver/mods:code-server-mod2` # Mod creation instructions diff --git a/root/etc/cont-init.d/98-aws-cli-install b/root/etc/cont-init.d/98-aws-cli-install new file mode 100644 index 0000000..81c5071 --- /dev/null +++ b/root/etc/cont-init.d/98-aws-cli-install @@ -0,0 +1,19 @@ +#!/usr/bin/with-contenv bash + +echo "*** AWSCLI Installer ***" +echo "Checking if awscli is installed" +apt update +if ! aws -v COMMAND &> /dev/null; then + + echo "aws not installed, installing now..." + + if ! pip -v COMMAND &> /dev/null + then + echo "pip3 not installed, installing now..." + apt install python3 python3-pip -y + pip3 install awscli + fi + +else + echo "aws installed skipping!" +fi \ No newline at end of file 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/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 d8ea0322f9193d2400c806a9dad88a4d6f058d8a Mon Sep 17 00:00:00 2001 From: Chris Caplan Date: Sat, 6 Mar 2021 19:45:16 +0000 Subject: [PATCH 2/3] changed to use apt-get and moved apt-get update to below if so it dont do unnecessary update --- root/etc/cont-init.d/98-aws-cli-install | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/root/etc/cont-init.d/98-aws-cli-install b/root/etc/cont-init.d/98-aws-cli-install index 81c5071..8391cd1 100644 --- a/root/etc/cont-init.d/98-aws-cli-install +++ b/root/etc/cont-init.d/98-aws-cli-install @@ -2,7 +2,7 @@ echo "*** AWSCLI Installer ***" echo "Checking if awscli is installed" -apt update + if ! aws -v COMMAND &> /dev/null; then echo "aws not installed, installing now..." @@ -10,7 +10,8 @@ if ! aws -v COMMAND &> /dev/null; then if ! pip -v COMMAND &> /dev/null then echo "pip3 not installed, installing now..." - apt install python3 python3-pip -y + apt-get update + apt-get install python3 python3-pip -y pip3 install awscli fi From 6922d0ef7a474f9b924b392624186cf074935cac Mon Sep 17 00:00:00 2001 From: capps1994 Date: Sat, 6 Mar 2021 20:58:13 +0000 Subject: [PATCH 3/3] removing mod creation instructions --- README.md | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/README.md b/README.md index becc76e..4c87020 100644 --- a/README.md +++ b/README.md @@ -4,14 +4,4 @@ This mod adds AWSCLI to code-server, to be installed/updated during container st In openssh-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:code-server-awscli` -If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:code-server-awscli|linuxserver/mods:code-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 `-`. 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. +If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:code-server-awscli|linuxserver/mods:code-server-mod2` \ No newline at end of file