updated version (#13)

* removed all inline tests

* added notary

* fixed WORKDIR

* fixed bosh issue

* removed extra periods

* updated version

Dockerfile

@@ -1,35 +1,37 @@
 FROM ubuntu:bionic
 LABEL maintainer="James Bowling <jbowling@vmware.com>" \
-      version="1.0" \
+      version="1.1" \
       description="This creates an image with all the cli binaries used in a Enterprise PKS environment."
 
 ENV BOSH_VERSION=6.0.0
+ENV NOTARY_VERSION=0.6.1
 
-WORKDIR /
+WORKDIR /root
 
 # Copy support files
-COPY bosh /root/bosh
-COPY scripts /root/scripts
+COPY bosh ./bosh
+COPY scripts ./scripts
 
 # Setup needed repositories and install base dependencies
-RUN chmod +x /root/scripts/*.sh && /root/scripts/setRepos.sh
+RUN chmod +x ./scripts/*.sh && ./scripts/setRepos.sh
 
 # Install utilities
-RUN /root/scripts/installAwsCli.sh
-RUN /root/scripts/installAzureCli.sh
-RUN /root/scripts/installBoshcli.sh && \
-    /root/scripts/installOmCli.sh && \
-    /root/scripts/installPKScli.sh && \
-    /root/scripts/installUaac.sh
-RUN /root/scripts/installGoogleSDK.sh
-RUN /root/scripts/installHelm.sh
-RUN /root/scripts/installKubectl.sh
-RUN /root/scripts/installVKE.sh
+RUN ./scripts/installAwsCli.sh
+RUN ./scripts/installAzureCli.sh
+RUN ./scripts/installBoshcli.sh && \
+    ./scripts/installOmCli.sh && \
+    ./scripts/installNotary.sh && \
+    ./scripts/installPKScli.sh && \
+    ./scripts/installUaac.sh
+RUN ./scripts/installGoogleSDK.sh
+RUN ./scripts/installHelm.sh
+RUN ./scripts/installKubectl.sh
+RUN ./scripts/installVKE.sh
 
 # Create Aliases
 RUN echo "source <(kubectl completion bash)" >> ~/.bashrc \
-    && echo "alias k=kubectl" >> /root/.profile \
-    && echo "alias p=pks" >> /root/.profile
+    && echo "alias k=kubectl" >> /.profile \
+    && echo "alias p=pks" >> /.profile
 
 # Expose ports for kube-proxy demo
 EXPOSE 8001/tcp

Jenkinsfile

@@ -3,7 +3,7 @@ node('docker-build') {
 	withEnv(['registry=dev/pks-cli-util',
 			 'registryUrl=https://harbor.jb.cloud.lab',
 			 'harborCredentials=2a0345af-3cba-4af6-90b2-017019f2ffe9',
-			 'tag=1.0.${BUILD_NUMBER}']) {
+			 'tag=1.1.${BUILD_NUMBER}']) {
 		stage('Preparation') {
 			/* Let's make sure we have the repository cloned to our workspace */
 			git branch: "${env.BRANCH_NAME}", url: 'https://github.com/vsential/pks-cli-util.git'

scripts/installAwsCli.sh

@@ -1,5 +1,3 @@
 # Installing AWS CLI
 echo "Installing AWS CLI" \
-&& pip3 install awscli \
-&& which aws \
-&& aws --version
+&& pip3 install awscli

scripts/installAzureCli.sh

@@ -1,5 +1,3 @@
 # Install Azure CLI
 echo "Installing Azure CLI" \
-    && apt-get install -q -y --no-install-recommends azure-cli \
-    && which az \
-    && az --version
+    && apt-get install -q -y --no-install-recommends azure-cli

scripts/installBoshcli.sh

@@ -2,6 +2,4 @@
 echo "Installing Bosh CLI" \
     && wget -q https://github.com/cloudfoundry/bosh-cli/releases/download/v${BOSH_VERSION}/bosh-cli-${BOSH_VERSION}-linux-amd64 \
     && mv bosh-cli-${BOSH_VERSION}-linux-amd64 /usr/local/bin/bosh \
-    && chmod +x ./usr/local/bin/bosh \
-    && which bosh \
-    && bosh --version
+    && chmod +x /usr/local/bin/bosh

scripts/installGoogleSDK.sh

@@ -1,5 +1,3 @@
 # Install Google Cloud SDK
 echo "Installing Google Cloud SDK" \
-    && apt-get install -q -y --no-install-recommends google-cloud-sdk \
-    && which gcloud \
-    && gcloud version
+    && apt-get install -q -y --no-install-recommends google-cloud-sdk

scripts/installKubectl.sh

@@ -1,4 +1,3 @@
 # Install Kubectl
 echo "Installing Kubectl" \
-    && apt-get -q install -y --no-install-recommends kubectl \
-    && kubectl version --short --client
+    && apt-get -q install -y --no-install-recommends kubectl

scripts/installNotary.sh

@@ -0,0 +1,4 @@
+echo "Installing notary" \
+    && wget -q https://github.com/theupdateframework/notary/releases/download/v${NOTARY_VERSION}/notary-Linux-amd64 \
+    && chmod +x notary-Linux-amd64 \
+    && mv notary-Linux-amd64 /usr/local/bin/notary

scripts/installOmCli.sh

@@ -1,5 +1,3 @@
 # Install Operations Manager CLI
 echo "Installing om cli" \
-    && apt-get install -q -y --no-install-recommends om \
-    && which om \
-    && om --version
+    && apt-get install -q -y --no-install-recommends om

scripts/installPKScli.sh

@@ -2,6 +2,4 @@
 echo "Installing PKS CLI" \
     && wget -q --no-check-certificate https://www.dropbox.com/s/4zm1216a89y5j78/pks-linux-amd64-1.5.0-build.291 \
     && mv pks-linux-amd64-1.5.0-build.291 /usr/local/bin/pks \
-    && chmod +x ./usr/local/bin/pks \
-    && which pks \
-    && pks --version
+    && chmod +x /usr/local/bin/pks

scripts/installUaac.sh

@@ -1,5 +1,3 @@
 # Install Cloud Foundry UAAC
 echo "Installing uaac" \
-    && gem install cf-uaac \
-    && which uaac \
-    && uaac --version
+    && gem install cf-uaac

scripts/installVKE.sh

@@ -2,6 +2,4 @@
 echo "Installing VKE" \
     && wget -q https://s3.amazonaws.com/vke-cli-us-east-1/latest/linux64/vke \
     && chmod +x ./vke \
-    && mv ./vke /usr/local/bin \
-    && which vke \
-    && vke --version
+    && mv vke /usr/local/bin