From 85409012d3cadb19d95dc711a6550d6f4afa70fd Mon Sep 17 00:00:00 2001
From: Konstantinos Livieratos <konstantinos.livieratos@detectify.com>
Date: Thu, 19 May 2022 14:26:29 +0200
Subject: [PATCH] Moved dockerfile to a separate folder folder for Dockerhub

---
 Dockerfile           | 21 +++------------------
 dockerhub/Dockerfile | 19 +++++++++++++++++++
 dockerhub/README.md  |  3 +++
 3 files changed, 25 insertions(+), 18 deletions(-)
 create mode 100644 dockerhub/Dockerfile
 create mode 100644 dockerhub/README.md

diff --git a/Dockerfile b/Dockerfile
index a543eec..220dd8b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,19 +1,4 @@
-FROM alpine:3.13
+# For contributors: in case someone would like to contribute a change in the base docker image,
+# please open a PR for the `dockerhub/Dockerfile` in the same project.
 
-ARG AWSCLI_VERSION="1.23.13"
-ARG HELM_VERSION="3.8.0"
-ARG KUBECTL_VERSION="1.24.0"
-
-RUN apk add py-pip curl wget ca-certificates git bash jq gcc alpine-sdk
-RUN pip install "awscli==${AWSCLI_VERSION}"
-RUN curl -L -o /usr/bin/kubectl https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl
-RUN chmod +x /usr/bin/kubectl
-
-RUN curl -o /usr/bin/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.21.2/2021-07-05/bin/linux/amd64/aws-iam-authenticator
-RUN chmod +x /usr/bin/aws-iam-authenticator
-
-RUN wget https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz -O - | tar -xzO linux-amd64/helm > /usr/local/bin/helm
-RUN chmod +x /usr/local/bin/helm
-
-COPY entrypoint.sh /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]:
+FROM koslib/ga-helm-eks:1.0
\ No newline at end of file
diff --git a/dockerhub/Dockerfile b/dockerhub/Dockerfile
new file mode 100644
index 0000000..a543eec
--- /dev/null
+++ b/dockerhub/Dockerfile
@@ -0,0 +1,19 @@
+FROM alpine:3.13
+
+ARG AWSCLI_VERSION="1.23.13"
+ARG HELM_VERSION="3.8.0"
+ARG KUBECTL_VERSION="1.24.0"
+
+RUN apk add py-pip curl wget ca-certificates git bash jq gcc alpine-sdk
+RUN pip install "awscli==${AWSCLI_VERSION}"
+RUN curl -L -o /usr/bin/kubectl https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl
+RUN chmod +x /usr/bin/kubectl
+
+RUN curl -o /usr/bin/aws-iam-authenticator https://amazon-eks.s3.us-west-2.amazonaws.com/1.21.2/2021-07-05/bin/linux/amd64/aws-iam-authenticator
+RUN chmod +x /usr/bin/aws-iam-authenticator
+
+RUN wget https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz -O - | tar -xzO linux-amd64/helm > /usr/local/bin/helm
+RUN chmod +x /usr/local/bin/helm
+
+COPY entrypoint.sh /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]:
diff --git a/dockerhub/README.md b/dockerhub/README.md
new file mode 100644
index 0000000..62a0070
--- /dev/null
+++ b/dockerhub/README.md
@@ -0,0 +1,3 @@
+# Dockerhub Dockerfile
+
+This `Dockerfile` is the source of the Dockerhub-hosted `koslib/ga-helm-eks` image, which is used in this action's local Dockerfile.
\ No newline at end of file