Reduces image footprint from ~950 MB to ~330 MB

- Changes base image to docker.io/hashicorp/terraform:0.12.24
- Removes unnecessary software like Calico, helm 2, and npm

Author: Sean Sundberg

.gitignore

@@ -1,2 +1,3 @@
 .idea/
 *.iml
+node_modules/

Dockerfile

@@ -1,7 +1,7 @@
-FROM registry.access.redhat.com/ubi8/ubi:8.1-397
+FROM docker.io/hashicorp/terraform:0.12.24
 
-ENV TERRAFORM_VERSION 0.12.20
-ENV TERRAFORM_IBMCLOUD_VERSION 1.2.1
+ENV TERRAFORM_VERSION 0.12.23
+ENV TERRAFORM_IBMCLOUD_VERSION 1.2.6
 ENV TERRAFORM_KUBERNETES_VERSION 1.10.0
 ENV TERRAFORM_HELM_VERSION 1.0.0
 ENV SUPPORTED_CALICO 3.12.0
@@ -10,20 +10,20 @@ ENV NODE_VERSION 12
 ENV SOLSA_VERSION 0.3.5
 ENV KUBECTL_VERSION 1.15.5
 
-RUN dnf install -y dnf-plugins-core --disableplugin=subscription-manager && \
-    dnf install -y golang --disableplugin=subscription-manager && \
-    dnf install -y sudo --disableplugin=subscription-manager && \
-    dnf install -y unzip --disableplugin=subscription-manager && \
-    dnf install -y openssl --disableplugin=subscription-manager
+RUN apk add --update-cache \
+  curl \
+  unzip \
+  sudo \
+  shadow \
+  bash \
+  openssl \
+  ca-certificates \
+  && rm -rf /var/cache/apk/*
 
 ##################################
 # Calico CLI
 ##################################
 
-RUN curl -O -L https://github.com/projectcalico/calicoctl/releases/download/v${SUPPORTED_CALICO}/calicoctl && \
-    mv ./calicoctl /usr/local/bin/calicoctl && \
-    chmod +x /usr/local/bin/calicoctl
-
 # Kustomize
 RUN opsys=linux && \
     curl -s https://api.github.com/repos/kubernetes-sigs/kustomize/releases |\
@@ -43,12 +43,6 @@ RUN opsys=linux && \
 
 WORKDIR $GOPATH/bin
 
-# Install Terraform
-RUN curl -O -L https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/terraform_${TERRAFORM_VERSION}_linux_amd64.zip && \
-    unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip && \
-    chmod +x terraform && \
-    rm -rf terraform_${TERRAFORM_VERSION}_linux_amd64.zip
-
 COPY src/bin/* /usr/local/bin/
 
 ##################################
@@ -76,28 +70,23 @@ COPY --chown=devops:devops src/etc/* ${HOME}/etc/
 ##################################
 
 # Install the ibmcloud cli
-RUN curl -sL https://ibm.biz/idt-installer | bash && \
-    ibmcloud config --check-version=false && \
-    ibmcloud plugin install cloud-databases
-
-# Install nvm
-RUN curl -o- https://raw.githubusercontent.com/creationix/nvm/v${NVM_VERSION}/install.sh | bash
-
-RUN echo 'echo "Initializing environment..."' > ${HOME}/.bashrc-ni && \
-    echo 'export NVM_DIR="${HOME}/.nvm"' >> ${HOME}/.bashrc-ni && \
-    echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> ${HOME}/.bashrc-ni
-
-# Set the BASH_ENV to /home/devops/.bashrc-ni so that it is executed in a
-# non-interactive shell
-#ENV BASH_ENV ${HOME}/.bashrc-ni
-
-# Pre-install node v11.12.0
-RUN echo ${PWD} && . ./.bashrc-ni && nvm install "v${NODE_VERSION}" && nvm use "v${NODE_VERSION}"
+RUN curl -fsSL https://clis.cloud.ibm.com/install/linux | sh && \
+    ibmcloud plugin install container-service && \
+    ibmcloud plugin install container-registry && \
+    ibmcloud config --check-version=false
 
 RUN mkdir -p ${HOME}/.terraform.d/plugins
 WORKDIR ${HOME}/.terraform.d/plugins
 
 # Install IBM Cloud Terraform Provider
+RUN curl -O -L https://github.com/IBM-Cloud/terraform-provider-ibm/releases/download/v1.2.1/linux_amd64.zip &&\
+    unzip linux_amd64.zip && \
+    chmod +x terraform-provider-ibm_* &&\
+    rm -rf linux_amd64.zip
+RUN curl -O -L https://github.com/IBM-Cloud/terraform-provider-ibm/releases/download/v1.2.2/linux_amd64.zip &&\
+    unzip linux_amd64.zip && \
+    chmod +x terraform-provider-ibm_* &&\
+    rm -rf linux_amd64.zip
 RUN curl -O -L https://github.com/IBM-Cloud/terraform-provider-ibm/releases/download/v${TERRAFORM_IBMCLOUD_VERSION}/linux_amd64.zip &&\
     unzip linux_amd64.zip && \
     chmod +x terraform-provider-ibm_* &&\
@@ -117,42 +106,29 @@ RUN curl -L https://releases.hashicorp.com/terraform-provider-helm/${TERRAFORM_H
 
 WORKDIR ${HOME}
 
-# Install yo
-RUN . ./.bashrc-ni && npm i -g yo
-RUN . ./.bashrc-ni && npm i -g @garage-catalyst/ibm-garage-cloud-cli
-
-# Install solsa
-RUN . ./.bashrc-ni && npm i -g solsa@${SOLSA_VERSION}
-
 COPY src/image-message ./image-message
 RUN cat ./image-message >> ./.bashrc-ni
 
-#RUN sudo dnf install python3 python3-pip -yv
-#RUN sudo ln -s /usr/bin/python3 /usr/bin/python
-#RUN sudo ln -s /usr/bin/pip3 /usr/bin/pip
-#RUN /usr/bin/python3 -m pip install --user ansible && \
-#    echo "export PATH=\"${PATH}:${HOME}/.local/bin\"" >> ./.bashrc-ni
-
-RUN sudo dnf clean all
-
 RUN curl -L https://github.com/openshift/origin/releases/download/v3.11.0/openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit.tar.gz --output oc-client.tar.gz && \
     tar xzf oc-client.tar.gz && \
     sudo cp openshift-origin-client-tools*/oc /usr/local/bin && \
     sudo chmod +x /usr/local/bin/oc && \
     rm -rf openshift-origin-client-tools* && \
-    rm oc-client.tar.gz
-#    sudo cp openshift-origin-client-tools*/kubectl /usr/local/bin && \
-#    sudo chmod +x /usr/local/bin/kubectl && \
+    rm oc-client.tar.gz && \
+    echo "alias oc='/lib/ld-musl-x86_64.so.1 --library-path /lib /usr/local/bin/oc'" >> ./.bashrc-ni
+
 
 RUN curl -LO https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl && \
     chmod +x ./kubectl && \
     sudo mv ./kubectl /usr/local/bin
 
-RUN sudo mv /usr/local/bin/helm /usr/local/bin/helm2 && \
-    curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash && \
-    sudo mv /usr/local/bin/helm /usr/local/bin/helm3 && \
-    sudo ln -s /usr/local/bin/helm2 /usr/local/bin/helm
+RUN curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash && \
+    sudo cp /usr/local/bin/helm /usr/local/bin/helm3
 
 RUN sudo chown -R devops ${HOME} && sudo chgrp -R 0 ${HOME} && sudo chmod -R g=u ${HOME}
 
+RUN curl -LO https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 && \
+    chmod a+x jq-linux64 && \
+    sudo mv jq-linux64 /usr/local/bin/jq
+
 ENTRYPOINT ["/bin/bash", "--init-file", "/home/devops/.bashrc-ni"]

config.yaml

@@ -14,11 +14,6 @@ commandTests:
     args: ["--help"]
     expectedOutput: ["Usage: terraform.*"]
 
-  - name: "Calico CLI installation"
-    command: "calicoctl"
-    args: ["--help"]
-    expectedOutput: ["Usage:\n.*calicoctl.*"]
-
   - name: "IBM Cloud CLI installation"
     command: "ibmcloud"
     args: ["--help"]
@@ -34,21 +29,11 @@ commandTests:
     args: ["plugin", "list"]
     expectedOutput: [".*container-registry.*"]
 
-  - name: "IBM Cloud cloud-databases plugin"
-    command: "ibmcloud"
-    args: ["plugin", "list"]
-    expectedOutput: [".*cloud-databases.*"]
-
   - name: "Kubectl CLI installation"
     command: "kubectl"
     args: ["version", "--client"]
     expectedOutput: [".*v1.15.5.*"]
 
-  - name: "Helm CLI installation"
-    command: "helm"
-    args: ["version", "--client"]
-    expectedOutput: [".*SemVer:.v2.16.*"]
-
   - name: "Helm 3 CLI installation"
     command: "helm3"
     args: ["version"]
@@ -64,51 +49,10 @@ commandTests:
     args: ["--help"]
     expectedOutput: ["usage: git.*"]
 
-  # - name: "Postgres installation"
-  #   command: "createdb"
-  #   args: ["--help"]
-  #   expectedOutput: ["createdb creates a PostgreSQL database.*"]
-
-  - name: "OpenShift client installation"
-    command: "oc"
-    args: ["--help"]
-    expectedOutput: [".*OpenShift.*"]
-
-#  - name: "python"
-#    command: "python"
-#    args: ["--help"]
-#    expectedOutput: [".*python.*"]
-#
-#  - name: "pip"
-#    command: "pip"
-#    args: ["--help"]
-#    expectedOutput: [".*pip.*"]
-#
-#  - name: "ansible"
-#    command: "/home/devops/.local/bin/ansible-playbook"
-#    args: ["--help"]
-#    expectedOutput: [".*ansible.*"]
-
-#  - name: "nvm installation"
-#    setup: [["/bin/bash", "--init-file", "/home/devops/.bashrc-ni"]]
-#    command: "nvm"
-#    args: ["--help"]
-#    expectedOutput: [".*Node Version Manager.*"]
-
-#  - name: "node installation"
-#    command: "node"
-#    args: ["--help"]
-#    expectedOutput: ["v\\d\\d[.]\\d\\d[.]\\d\n"]
-
-  - name: "SolSA CLI installation"
-    command: "bash"
-    args: ["-c", "source /home/devops/.nvm/nvm.sh && solsa help"]
-    expectedError: ["Usage:\n.*solsa <command> <solution> \\[flags\\].*"]
-
-#  - name: "yo installation"
-#    command: "yo"
+#  - name: "OpenShift client installation"
+#    command: "/lib/ld-musl-x86_64.so.1 --library-path /lib /usr/local/bin/oc"
 #    args: ["--help"]
-#    expectedOutput: ["\\d[.]\\d[.]\\d\n"]
+#    expectedOutput: [".*OpenShift.*"]
 
 fileExistenceTests:
   - name: 'jenkins-config-template.xml'

package.json

@@ -1,10 +1,28 @@
 {
-  "name": "ibm-garage-cli-tools",
-  "version": "0.0.26",
-  "org": "garagecatalyst",
-  "branch": "next",
+  "name": "cli-tools",
+  "version": "0.1.7",
+  "org": "ibmgaragecloud",
+  "branch": "lite",
   "description": "This repository contains a docker image to help setup an IBM Cloud Public development environment.",
   "main": "index.js",
+  "release-it": {
+    "git": {
+      "tagName": "v${version}"
+    },
+    "npm": {
+      "publish": false
+    },
+    "github": {
+      "release": true
+    },
+    "hooks": {
+      "before:init": [
+        "npm test"
+      ],
+      "after:bump": "npm run build",
+      "after:release": "echo Successfully released ${name} v${version} to ${repo.repository}."
+    }
+  },
   "scripts": {
     "build": "./scripts/build.sh $npm_package_name $npm_package_version $npm_package_branch",
     "pretest": "npm run build",
@@ -14,13 +32,17 @@
     "push": "npm run push:only",
     "push:only": "./scripts/publish.sh $npm_package_org $npm_package_name $npm_package_version $npm_package_branch",
     "pull": "./scripts/pull.sh $npm_package_org $npm_package_name $npm_package_version $npm_package_branch",
-    "start": "docker run -it $npm_package_name:$npm_package_version$(echo $npm_package_branch | sed -E \"s/(.+)/-\\1/g\")"
+    "start": "docker run -it $npm_package_name:$npm_package_version$(echo $npm_package_branch | sed -E \"s/(.+)/-\\1/g\")",
+    "release": "release-it --verbose -VV"
   },
   "repository": {
     "type": "git",
     "url": "git@github.ibm.com:garage-catalyst/client-tools-image.git"
   },
   "keywords": [],
   "author": "",
-  "license": "ISC"
+  "license": "ISC",
+  "devDependencies": {
+    "release-it": "^13.0.0"
+  }
 }