Merge pull request #1 from shoplineapp/feature/gather-up-tools

Feature/gather up tools

Dockerfile

@@ -1,32 +1,39 @@
-FROM seitk/pipeline-eks AS builder
+FROM alpine:3.7 AS builder
+
+RUN apk add --update --no-cache -t \
+      deps \
+      ca-certificates \
+      curl \
+      python \
+      py-pip \
+      jq \
+      git \
+      openssh \
+      groff \
+      less \
+      mailcap \
+      bash \
+    && pip install --upgrade pip \
+    && pip install --no-cache-dir awscli==1.16.270 \
+    && apk del py-pip \
+    && rm -rf /var/cache/apk/* /root/.cache/pip/*
+
+# kubectl
+RUN curl -LO https://dl.k8s.io/release/v1.21.0/bin/linux/amd64/kubectl \
+    && install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
 # gomplate
 RUN curl -LO https://github.com/hairyhenderson/gomplate/releases/download/v3.6.0/gomplate_linux-amd64-slim \ 
     && chmod +x ./gomplate_linux-amd64-slim \
     && mv ./gomplate_linux-amd64-slim /usr/local/bin/gomplate
 # helm v3.2.4
 RUN curl -LO https://get.helm.sh/helm-v3.2.4-linux-amd64.tar.gz \
     && tar -xvf helm-v3.2.4-linux-amd64.tar.gz \
-    && mv ./linux-amd64/helm /usr/local/bin/helm3
+    && mv ./linux-amd64/helm /usr/local/bin/helm
+# helm diff
+RUN helm plugin install https://github.com/databus23/helm-diff
 # git crypt
 RUN apk add --update alpine-sdk make libressl-dev
 RUN git clone https://github.com/AGWA/git-crypt.git \
     && cd git-crypt \
     && make \
-    && make install PREFIX=/usr/local
-# aliyun cli v3.0.14
-RUN curl -L -O https://github.com/aliyun/aliyun-cli/releases/download/v3.0.14/aliyun-cli-linux-amd64.tar.gz \
-    && tar zxvf aliyun-cli-linux-amd64.tar.gz \
-    && sudo mv aliyun /usr/local/bin/aliyun
-# # terraform 0.13.2
-RUN curl -L -O https://releases.hashicorp.com/terraform/0.13.2/terraform_0.13.2_linux_amd64.zip \
-    &&  unzip terraform_0.13.2_linux_amd64.zip -d /usr/local/bin
-FROM seitk/pipeline-eks
-# git crypt require duplicity (gpg)
-RUN apk add duplicity zip
-COPY --from=builder /usr/local/bin/gomplate /usr/local/bin/gomplate
-COPY --from=builder /usr/local/bin/helm3 /usr/local/bin/helm3
-COPY --from=builder /usr/local/bin/git-crypt /usr/local/bin/git-crypt
-COPY --from=builder /usr/local/bin/aliyun /usr/local/bin/aliyun
-COPY --from=builder /usr/local/bin/terraform /usr/local/bin/terraform
-# helm diff
-RUN helm3 plugin install https://github.com/databus23/helm-diff
+    && make install PREFIX=/usr/local

README.md

@@ -1,11 +1,11 @@
 # Usage
 
-The Dockerfile base on https://hub.docker.com/r/seitk/pipeline-eks and include gomplate, git-crypt, helm3 and aliyun cli 3.0.14
+The Docker image includes some common tools for pipeline works with EKS, likes gomplate, git-crypt, helm, kubectl and awscli.
 
 1. docker build -t <docker_hub>/pipeline-eks:<image_tag> .
 
 2. docker push <docker_hub>/pipeline-eks:<image_tag>
 
 ## Docker Image
 
-shoplineapp/pipeline-eks:0.7
+shoplineapp/pipeline-eks