[cf-cli|bosh-cli-v2-cf-cli]: cf cli bump to 8.3.0

- cf cli: [8.3.0](https://github.com/cloudfoundry/cli/releases/tag/v8.3.0) we also remove 'app-autoscaler-plugin' as we do not use it fixup! ensure autoscaler plugin in not included
orange-cloudfoundry · Mar 17, 2022 · e2d6407 · e2d6407
1 parent d0d7058
commit e2d6407
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 11 deletions.
diff --git a/bosh-cli-v2-cf-cli/Dockerfile b/bosh-cli-v2-cf-cli/Dockerfile
@@ -2,7 +2,7 @@ FROM orangecloudfoundry/bosh-cli-v2:latest
 
 # we use libc6 instead of libc6-compat as we do not use alpine base image
 ENV CF_PACKAGES "unzip curl openssl ca-certificates git libc6 bash jq gettext make"
-ENV CF_CLI_VERSION "7.4.0"
+ENV CF_CLI_VERSION "8.3.0"
 ENV SPRUCE_VERSION "1.29.0"
 
 # we also use apt-get as we use an Ubuntu image, not an Alpine
@@ -15,8 +15,6 @@ RUN rm -rf ~/.bosh/cache  # Cleanup AWS CPI
 
 RUN curl -L "https://cli.run.pivotal.io/stable?release=linux64-binary&version=${CF_CLI_VERSION}" | tar -zx -C /usr/local/bin
 
-RUN cf install-plugin -f -r CF-Community app-autoscaler-plugin
-
 RUN curl -Lo /usr/local/bin/spruce https://github.com/geofffranks/spruce/releases/download/v${SPRUCE_VERSION}/spruce-linux-amd64 \
   && chmod +x /usr/local/bin/spruce
 
diff --git a/bosh-cli-v2-cf-cli/bosh-cli-v2-cf-cli_spec.rb b/bosh-cli-v2-cf-cli/bosh-cli-v2-cf-cli_spec.rb
@@ -4,7 +4,7 @@
 
 BOSH_CLI_VERSION="6.4.17-f0454a75-2022-02-25T00:42:57Z"
 CREDHUB_VERSION='2.9.1'
-CF_CLI_VERSION="7.4.0"
+CF_CLI_VERSION="8.3.0"
 SPRUCE_BIN = "/usr/local/bin/spruce"
 SPRUCE_VERSION = "1.29.0"
 BOSH_ENV_DEPS = "build-essential zlibc zlib1g-dev openssl libxslt1-dev libxml2-dev \

diff --git a/bosh-cli-v2/Dockerfile b/bosh-cli-v2/Dockerfile
@@ -24,7 +24,6 @@ RUN wget -nv https://s3.amazonaws.com/bosh-cli-artifacts/${BOSH_CLI_FILENAME} \
   && chmod +x ${BOSH_CLI_FILENAME} \
   && mv ${BOSH_CLI_FILENAME} /usr/local/bin/bosh
 
-
 ENV CREDHUB_CLI_VERSION 2.9.1
 ENV CREDHUB_CLI_SUM df8aa256d4563d741bda71e4e0baff077addce8438dba4f9157504b387b93d9f
 ENV CREDHUB_CLI_FILENAME credhub-linux-${CREDHUB_CLI_VERSION}.tgz

diff --git a/cf-cli/Dockerfile b/cf-cli/Dockerfile
@@ -1,14 +1,12 @@
 FROM ruby:2.7-alpine3.11
 
 ENV PACKAGES "unzip curl openssl ca-certificates git libc6-compat bash jq gettext make"
-ENV CF_CLI_VERSION "7.4.0"
+ENV CF_CLI_VERSION "8.3.0"
 ENV SPRUCE_VERSION "1.29.0"
 
 RUN apk add --no-cache $PACKAGES
 
 RUN curl -L "https://cli.run.pivotal.io/stable?release=linux64-binary&version=${CF_CLI_VERSION}" | tar -zx -C /usr/local/bin
 
-RUN cf install-plugin -f -r CF-Community app-autoscaler-plugin
-
 RUN curl -Lo /usr/local/bin/spruce https://github.com/geofffranks/spruce/releases/download/v${SPRUCE_VERSION}/spruce-linux-amd64 \
   && chmod +x /usr/local/bin/spruce
diff --git a/cf-cli/cf-cli_spec.rb b/cf-cli/cf-cli_spec.rb
@@ -2,7 +2,7 @@
 require 'docker'
 require 'serverspec'
 
-CF_CLI_VERSION="7.4.0"
+CF_CLI_VERSION="8.3.0"
 SPRUCE_BIN = "/usr/local/bin/spruce"
 SPRUCE_VERSION = "1.29.0"
 
@@ -93,8 +93,8 @@
     ).to eq(0)
   end
 
-  it "has the cf cli app autoscaler plugin" do
+  it "has not the cf cli app autoscaler plugin" do
     plugins = command("cf aasp -h")
-    expect(plugins.exit_status).to eq(0)
+    expect(plugins.exit_status).to eq(1)
   end
 end