From 7c4683c59bb6004cfd508b2bf7383da839ee994d Mon Sep 17 00:00:00 2001 From: N3rdP1um23 Date: Fri, 5 Feb 2021 10:10:54 -0500 Subject: [PATCH] Upgraded repo with actual wait-for-internet commands --- .github/workflows/BuildImage.yml | 4 ++-- .gitignore | 4 ++++ Dockerfile | 2 +- Dockerfile.complex | 23 ------------------- README.md | 18 ++++----------- root/etc/cont-init.d/98-vpn-config | 27 ----------------------- root/etc/cont-init.d/98-wait-for-internet | 7 ++++++ root/etc/services.d/sshvpn/run | 3 --- 8 files changed, 18 insertions(+), 70 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/98-wait-for-internet delete mode 100644 root/etc/services.d/sshvpn/run diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml index 518b0d8..62afcd3 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: "universal" #replace + MODNAME: "wait_for_internet" #replace jobs: build: diff --git a/.gitignore b/.gitignore index 96374c4..3af0977 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,7 @@ $RECYCLE.BIN/ Network Trash Folder Temporary Items .apdisk + + +# VS Code fodler +.vs \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 4ece5e8..3713d8e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM scratch -LABEL maintainer="username" +LABEL maintainer="n3rdp1um23" # 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..db24525 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,7 @@ -# Rsync - Docker mod for openssh-server +# Universal Wait for Internet - Docker mod for an waiting on an active internet connection -This mod adds rsync to openssh-server, to be installed/updated during container start. +This mod is used to help wait until an active internet connection is established. By default, it will attempt to access https://www.linuxserver.io/. If after 60s a connection cannot be established, it will wait for 10s before attempting again. This will happen until an active connection is established. -In openssh-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:openssh-server-rsync` +In any docker container arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:universal-wait-for-internet` -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 `-`. 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:universal-wait-for-internet|linuxserver/mods:universal-git` \ 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/cont-init.d/98-wait-for-internet b/root/etc/cont-init.d/98-wait-for-internet new file mode 100644 index 0000000..72db988 --- /dev/null +++ b/root/etc/cont-init.d/98-wait-for-internet @@ -0,0 +1,7 @@ +## !/usr/bin/with-contenv bash + +# Loop until an active internet connection is established +until $(curl --max-time 60 -s -o /dev/null https://www.linuxserver.io/); do + # Sleep to allow cooldown + sleep 10 +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