From b745af9285d380103622c4b06604e748c709c7f0 Mon Sep 17 00:00:00 2001
From: Jerome Petazzoni <jerome.petazzoni@gmail.com>
Date: Sun, 1 Dec 2019 11:44:02 -0600
Subject: [PATCH 1/6] Add netlify file + link to github

---
 netlify.toml | 4 ++++
 shpod.sh     | 2 ++
 2 files changed, 6 insertions(+)
 create mode 100644 netlify.toml

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..ea7c0cb 100755
--- a/shpod.sh
+++ b/shpod.sh
@@ -1,4 +1,6 @@
 #!/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

From fbb63f39274c0606b14571f9a5a33bd5dcda193b Mon Sep 17 00:00:00 2001
From: Jerome Petazzoni <jerome.petazzoni@gmail.com>
Date: Thu, 30 Jan 2020 01:04:13 -0600
Subject: [PATCH 2/6] Add short URL

---
 README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/README.md b/README.md
index 6797d6c..6d2cb32 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:
 
@@ -38,6 +43,13 @@ To execute it:
 curl https://raw.githubusercontent.com/jpetazzo/shpod/master/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
 step by step, check the next section.
 

From e435759dba83f540a4cb6eec430ce01c097f9b67 Mon Sep 17 00:00:00 2001
From: Jerome Petazzoni <jerome.petazzoni@gmail.com>
Date: Fri, 14 Aug 2020 16:40:05 +0200
Subject: [PATCH 3/6] Bump versions (closes #5)

---
 Dockerfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 428fda6..0b757a4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,9 @@
 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

From 8675fc127624dbff824a5a0334b7b7c586c06b5b Mon Sep 17 00:00:00 2001
From: Jerome Petazzoni <jerome.petazzoni@gmail.com>
Date: Fri, 14 Aug 2020 17:00:51 +0200
Subject: [PATCH 4/6] Add OpenSSL since the RBAC section uses it a bit for demo
 purposes

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 0b757a4..b02a0d4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ ENV \
  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

From 124681da1392d13583c1faac560ba5c231b13ce7 Mon Sep 17 00:00:00 2001
From: Ivaylo Tsokov <ivo_c@abv.bg>
Date: Mon, 24 Aug 2020 18:04:52 +0300
Subject: [PATCH 5/6] Update shpod.sh

master branch now renamed to main
---
 shpod.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shpod.sh b/shpod.sh
index ea7c0cb..f1ca3f5 100755
--- a/shpod.sh
+++ b/shpod.sh
@@ -4,7 +4,7 @@
 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

From ac626ed4b7785dce17a67a1ccdbad73e79c4d460 Mon Sep 17 00:00:00 2001
From: Ivaylo Tsokov <ivo_c@abv.bg>
Date: Mon, 24 Aug 2020 18:06:05 +0300
Subject: [PATCH 6/6] Update README.md

master branch renamed to main
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6d2cb32..8def6cb 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ 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:
@@ -58,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: