From d1464e1cde39e0213c493dfe1c68fd4e887834b0 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sun, 27 Sep 2020 19:59:57 -0500 Subject: [PATCH 1/2] Universal git --- .travis.yml | 8 ++++---- Dockerfile | 2 ++ Dockerfile.complex | 21 --------------------- README.md | 18 ++++-------------- root/etc/cont-init.d/03-git | 21 +++++++++++++++++++++ root/etc/cont-init.d/98-vpn-config | 27 --------------------------- root/etc/services.d/sshvpn/run | 3 --- 7 files changed, 31 insertions(+), 69 deletions(-) delete mode 100644 Dockerfile.complex create mode 100644 root/etc/cont-init.d/03-git delete mode 100644 root/etc/cont-init.d/98-vpn-config delete mode 100644 root/etc/services.d/sshvpn/run diff --git a/.travis.yml b/.travis.yml index e6e5b1f..b00acf0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ language: shell branches: only: - - - #replace variables, omit brackets + - universal-git #replace variables, omit brackets services: - docker @@ -12,8 +12,8 @@ services: env: global: - DOCKERHUB="linuxserver/mods" #don't modify - - BASEIMAGE="baseimagename" #replace - - MODNAME="modname" #replace + - BASEIMAGE="universal" #replace + - MODNAME="git" #replace jobs: include: @@ -32,4 +32,4 @@ jobs: - echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin # Push all of the tags - docker push ${DOCKERHUB}:${BASEIMAGE}-${MODNAME}-${TRAVIS_COMMIT} - - docker push ${DOCKERHUB}:${BASEIMAGE}-${MODNAME} \ No newline at end of file + - docker push ${DOCKERHUB}:${BASEIMAGE}-${MODNAME} diff --git a/Dockerfile b/Dockerfile index 2f24b20..482658a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ FROM scratch +LABEL maintainer="nemchik" + # copy local files COPY root/ / diff --git a/Dockerfile.complex b/Dockerfile.complex deleted file mode 100644 index 4463d83..0000000 --- a/Dockerfile.complex +++ /dev/null @@ -1,21 +0,0 @@ -## Buildstage ## -FROM lsiobase/alpine:3.9 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 - -# Add files from buildstage -COPY --from=buildstage /root-layer/ / diff --git a/README.md b/README.md index 2418e53..64f6a15 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,7 @@ -# Rsync - Docker mod for openssh-server +# git - Docker mod for any container -This mod adds rsync to openssh-server, to be installed/updated during container start. +This mod adds git to any container, to be installed/updated during container start. -In openssh-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:openssh-server-rsync` +In any container docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:universal-git` -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 - -* 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. -* Fork the repo, checkout the newly created branch. -* 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 `travis.yml`. Customize the build branch, and the vars for `BASEIMAGE` and `MODNAME`. -* Submit PR against the branch created by the team. \ No newline at end of file +If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:universal-git|linuxserver/mods:universal-mod2` diff --git a/root/etc/cont-init.d/03-git b/root/etc/cont-init.d/03-git new file mode 100644 index 0000000..23fed0a --- /dev/null +++ b/root/etc/cont-init.d/03-git @@ -0,0 +1,21 @@ +#!/usr/bin/with-contenv bash + +# Determine if setup is needed +if [[ -n "$(command -v git)" ]]; then + ## Ubuntu + if [ -f /usr/bin/apt ]; then + apt-get update + apt-get install --no-install-recommends -y \ + git + fi + # Alpine + if [ -f /sbin/apk ]; then + apk add --no-cache \ + git + fi + # cleanup + rm -rf \ + /tmp/* \ + /var/lib/apt/lists/* \ + /var/tmp/* +fi 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 58ed5113ab0f32968c898b7e3a7f6722677d7318 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Mon, 28 Sep 2020 07:35:11 -0500 Subject: [PATCH 2/2] Universal standard numbering and remove cleanup --- root/etc/cont-init.d/{03-git => 95-git} | 5 ----- 1 file changed, 5 deletions(-) rename root/etc/cont-init.d/{03-git => 95-git} (79%) diff --git a/root/etc/cont-init.d/03-git b/root/etc/cont-init.d/95-git similarity index 79% rename from root/etc/cont-init.d/03-git rename to root/etc/cont-init.d/95-git index 23fed0a..4b4004b 100644 --- a/root/etc/cont-init.d/03-git +++ b/root/etc/cont-init.d/95-git @@ -13,9 +13,4 @@ if [[ -n "$(command -v git)" ]]; then apk add --no-cache \ git fi - # cleanup - rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* fi