diff --git a/Dockerfile b/Dockerfile index 428fda6..b02a0d4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,13 +1,13 @@ FROM alpine ENV \ - COMPOSE_VERSION=1.25.0 \ - HELM_VERSION=3.0.0 \ - KUBECTL_VERSION=1.16.3 \ - SHIP_VERSION=0.40.0 \ + COMPOSE_VERSION=1.26.2 \ + HELM_VERSION=3.3.0 \ + KUBECTL_VERSION=1.18.8 \ + SHIP_VERSION=0.51.3 \ STERN_VERSION=1.11.0 ## Alpine base ## ENV COMPLETIONS=/usr/share/bash-completion/completions -RUN apk add bash bash-completion curl git jq libintl ncurses tmux vim apache2-utils +RUN apk add bash bash-completion curl git jq libintl ncurses openssl tmux vim apache2-utils RUN sed -i s,/bin/ash,/bin/bash, /etc/passwd ## Ubuntu base ## #ENV COMPLETIONS=/etc/bash_completion.d diff --git a/README.md b/README.md index 6797d6c..8def6cb 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,10 @@ # shpod +**TL,DR:** `curl https://shpod.sh | sh` + + +## What's this? + `shpod` is a container image based on the Alpine distribution and embarking a bunch of tools useful when working with Kubernetes: @@ -35,7 +40,14 @@ The [shpod.sh](shpod.sh) script will: To execute it: ```bash -curl https://raw.githubusercontent.com/jpetazzo/shpod/master/shpod.sh | sh +curl https://raw.githubusercontent.com/jpetazzo/shpod/main/shpod.sh | sh +``` + +It's also available with short URLs: + +```bash +curl https://shpod.sh | sh +curl https://shpod.me | sh ``` If you don't like `curl|sh`, and/or if you want to execute things @@ -46,7 +58,7 @@ step by step, check the next section. 1. Deploy the shpod pod: ``` - kubectl apply -f https://raw.githubusercontent.com/jpetazzo/shpod/master/shpod.yaml + kubectl apply -f https://raw.githubusercontent.com/jpetazzo/shpod/main/shpod.yaml ``` 2. Attach to the shpod pod: diff --git a/netlify.toml b/netlify.toml new file mode 100644 index 0000000..9b202e1 --- /dev/null +++ b/netlify.toml @@ -0,0 +1,4 @@ +[[redirects]] + from = "/" + to = "/shpod.sh" + status = 200 diff --git a/shpod.sh b/shpod.sh index ecbd618..f1ca3f5 100755 --- a/shpod.sh +++ b/shpod.sh @@ -1,8 +1,10 @@ #!/bin/sh +# For more information about shpod, check it out on GitHub: +# https://github.com/jpetazzo/shpod if [ -f shpod.yaml ]; then YAML=shpod.yaml else - YAML=https://raw.githubusercontent.com/jpetazzo/shpod/master/shpod.yaml + YAML=https://raw.githubusercontent.com/jpetazzo/shpod/main/shpod.yaml fi echo "Applying YAML: $YAML..." kubectl apply -f $YAML