From 003c66d19e32b2a32bc1e3b211c6fe940c1de258 Mon Sep 17 00:00:00 2001
From: Bret Fisher <bret@bretfisher.com>
Date: Sat, 15 Jan 2022 16:41:53 -0500
Subject: [PATCH] tweaking for k8smastery (#44)

* tweaking for k8smastery

* linting tweaks
---
 .github/dependabot.yml                 |  2 +-
 .github/linters/.markdown-lint.yml     |  3 +++
 .github/workflows/automated-build.yaml | 12 ------------
 Dockerfile                             |  2 +-
 README.md                              | 17 +++--------------
 motd                                   |  2 +-
 shpod.yaml                             |  2 +-
 7 files changed, 10 insertions(+), 30 deletions(-)
 create mode 100644 .github/linters/.markdown-lint.yml
 delete mode 100644 .github/workflows/automated-build.yaml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 6fddca0..f9ecf57 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -4,4 +4,4 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "monthly"
diff --git a/.github/linters/.markdown-lint.yml b/.github/linters/.markdown-lint.yml
new file mode 100644
index 0000000..ab67716
--- /dev/null
+++ b/.github/linters/.markdown-lint.yml
@@ -0,0 +1,3 @@
+# MD013/line-length - Line length
+MD013:
+  code_blocks: false
\ No newline at end of file
diff --git a/.github/workflows/automated-build.yaml b/.github/workflows/automated-build.yaml
deleted file mode 100644
index 057d51e..0000000
--- a/.github/workflows/automated-build.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-name: Automated Build
-
-on:
-  push:
-    branches:
-      - main
-
-jobs:
-  automated-build:
-    uses: jpetazzo/workflows/.github/workflows/automated-build.yaml@main
-    secrets:
-      DOCKER_HUB_TOKEN: ${{ secrets.DOCKER_HUB_TOKEN }}
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 2ee5e11..ae2dcf6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -215,7 +215,7 @@ RUN ( \
     ) > versions.txt
 
 # If there is a tty, give us a shell.
-# (This happens e.g. when we do "docker run -ti jpetazzo/shpod".)
+# (This happens e.g. when we do "docker run -ti bretfisher/shpod".)
 # Otherwise, start an SSH server.
 # (This happens e.g. when we use that image in a Pod in a Deployment.)
 CMD \
diff --git a/README.md b/README.md
index 2d78a0f..58bc4ab 100644
--- a/README.md
+++ b/README.md
@@ -5,18 +5,7 @@
 
 **TL,DR:** `curl https://k8smastery.com/shpod.sh | sh`
 
-If you are looking for an image that works on the ARM architecture
-(like the Raspberry Pi or the Apple M1), have a look at
-[BretFisher/shpod](https://github.com/BretFisher/shpod) instead.
-Bret's fork is also a state-of-the-art example of a multi-arch
-Dockerfile!
-
-If you are looking for an image that works on the ARM architecture
-(like the Raspberry Pi or the Apple M1), have a look at
-[BretFisher/shpod](https://github.com/BretFisher/shpod) instead.
-Bret's fork is also a state-of-the-art example of a multi-arch
-Dockerfile!
-
+Thanks to @jpetazzo for this fantastic open source!
 
 ## What's this?
 
@@ -74,7 +63,7 @@ server to obtain the shell.
 
 Run it in a Pod and attach directly to it:
 ```bash
-kubectl run shpod --restart=Never --rm -it --image=jpetazzo/shpod
+kubectl run shpod --restart=Never --rm -it --image=bretfisher/shpod
 ```
 
 This should give you a shell in a pod, with all the tools installed.
@@ -88,7 +77,7 @@ until you create an appropriate RoleBinding or ClusterRoleBinding
 Run as a Pod (or Deployment), then expose (or port-forward) to port
 22 in that Pod, and connect with an SSH client:
 ```bash
-kubectl run shpod --image=jpetazzo/shpod
+kubectl run shpod --image=bretfisher/shpod
 kubectl wait pod shpod --for=condition=ready
 kubectl port-forward pod/shpod 2222:22
 ssh -l k8s -p 2222 localhost # the default password is "k8s"
diff --git a/motd b/motd
index 58a1e06..f46e3e0 100644
--- a/motd
+++ b/motd
@@ -1,6 +1,6 @@
 
 🐚 Welcome to shpod - SHell in a POD.
 🔎 Check "/versions.txt" to see the list of included tools.
-🔗 See https://github.com/jpetazzo/shpod for more information.
+🔗 See https://github.com/bretfisher/shpod for more information.
 📦️ You can install extra packages with 'sudo apk add PKGNAME'.
 
diff --git a/shpod.yaml b/shpod.yaml
index 95ac8c2..8670d43 100644
--- a/shpod.yaml
+++ b/shpod.yaml
@@ -31,7 +31,7 @@ spec:
   serviceAccountName: shpod
   containers:
   - name: shpod
-    image: jpetazzo/shpod
+    image: bretfisher/shpod
     stdin: true
     tty: true
     env: