From 36f541fb64b2f1d86300891b87007fccf994c008 Mon Sep 17 00:00:00 2001 From: malcgds Date: Fri, 30 Jun 2023 13:53:37 +0100 Subject: [PATCH 1/9] [#185500801] Updated cf-cli --- .github/workflows/build-image-base.yml | 2 +- cf-cli/Dockerfile | 2 +- cf-cli/cf-cli_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-image-base.yml b/.github/workflows/build-image-base.yml index d4995f5a..ce8dfe54 100644 --- a/.github/workflows/build-image-base.yml +++ b/.github/workflows/build-image-base.yml @@ -105,7 +105,7 @@ jobs: files: "./${{ inputs.image }}/${{ inputs.image }}_spec.rb" - name: Build for acceptance test - if: steps.check_for_tests.outputs.files_exist == 'true' + if: steps.check_for_tests.outputs.files_exists == 'true' uses: docker/build-push-action@v3.2.0 with: context: ./${{ inputs.image }} diff --git a/cf-cli/Dockerfile b/cf-cli/Dockerfile index 6465a9a1..02ee20b1 100644 --- a/cf-cli/Dockerfile +++ b/cf-cli/Dockerfile @@ -1,7 +1,7 @@ FROM ghcr.io/alphagov/paas/ruby-base:main ENV PACKAGES "unzip curl openssl ca-certificates git libc6-compat bash jq gettext make" -ENV CF_CLI_VERSION "8.6.0" +ENV CF_CLI_VERSION "8.7.1" ENV SPRUCE_VERSION "1.30.2" RUN apk add --no-cache $PACKAGES diff --git a/cf-cli/cf-cli_spec.rb b/cf-cli/cf-cli_spec.rb index c6ec8c69..9f81a0ba 100644 --- 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="8.6.0" +CF_CLI_VERSION="8.7.1" SPRUCE_BIN = "/usr/local/bin/spruce" SPRUCE_VERSION = "1.27.0" From b267b18e7c3f5a570f403a9a624bf8846bd59d47 Mon Sep 17 00:00:00 2001 From: malcgds Date: Wed, 5 Jul 2023 14:42:42 +0100 Subject: [PATCH 2/9] [#185500801] Updated docker/build-push-action --- .github/workflows/build-image-base.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-image-base.yml b/.github/workflows/build-image-base.yml index ce8dfe54..8fb7cd73 100644 --- a/.github/workflows/build-image-base.yml +++ b/.github/workflows/build-image-base.yml @@ -106,7 +106,7 @@ jobs: - name: Build for acceptance test if: steps.check_for_tests.outputs.files_exists == 'true' - uses: docker/build-push-action@v3.2.0 + uses: docker/build-push-action@v4.1.1 with: context: ./${{ inputs.image }} file: ./${{ inputs.image }}/${{inputs.dockerfile}} @@ -129,7 +129,7 @@ jobs: if: steps.check_for_tests.outputs.files_exist == 'true' - name: Build and push to ghcr - uses: docker/build-push-action@v3.2.0 + uses: docker/build-push-action@v4.1.1 with: context: ./${{ inputs.image }} platforms: ${{ inputs.platforms }} @@ -147,7 +147,7 @@ jobs: password: ${{ secrets.DOCKERHUB_PASSWORD }} - name: Build and push to docker hub - uses: docker/build-push-action@v3.2.0 + uses: docker/build-push-action@v4.1.1 with: context: ./${{ inputs.image }} platforms: ${{ inputs.platforms }} From 3b64714379f327f94baef2e65376b2d58876982a Mon Sep 17 00:00:00 2001 From: malcgds Date: Wed, 5 Jul 2023 16:43:13 +0100 Subject: [PATCH 3/9] [#185500801] Updated github workflow --- .github/workflows/build-image-base.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-image-base.yml b/.github/workflows/build-image-base.yml index 8fb7cd73..46c9dcd8 100644 --- a/.github/workflows/build-image-base.yml +++ b/.github/workflows/build-image-base.yml @@ -106,7 +106,7 @@ jobs: - name: Build for acceptance test if: steps.check_for_tests.outputs.files_exists == 'true' - uses: docker/build-push-action@v4.1.1 + uses: docker/build-push-action@v4 with: context: ./${{ inputs.image }} file: ./${{ inputs.image }}/${{inputs.dockerfile}} @@ -121,15 +121,15 @@ jobs: uses: ruby/setup-ruby@v1 with: bundler-cache: true - if: steps.check_for_tests.outputs.files_exist == 'true' + if: steps.check_for_tests.outputs.files_exists == 'true' - name: Acceptance Tests env: DOCKER_IMAGE: "${{ env.TEST_TAG }}" run: bundle exec rspec ./${{ inputs.image }}/${{ inputs.image }}_spec.rb - if: steps.check_for_tests.outputs.files_exist == 'true' + if: steps.check_for_tests.outputs.files_exists == 'true' - name: Build and push to ghcr - uses: docker/build-push-action@v4.1.1 + uses: docker/build-push-action@v4 with: context: ./${{ inputs.image }} platforms: ${{ inputs.platforms }} From a02f1471970321e3d63071c6aff637994e69167d Mon Sep 17 00:00:00 2001 From: malcgds Date: Wed, 5 Jul 2023 17:10:03 +0100 Subject: [PATCH 4/9] [#185500801] Updated spruce version --- cf-cli/cf-cli_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cf-cli/cf-cli_spec.rb b/cf-cli/cf-cli_spec.rb index 9f81a0ba..ee708107 100644 --- a/cf-cli/cf-cli_spec.rb +++ b/cf-cli/cf-cli_spec.rb @@ -4,7 +4,7 @@ CF_CLI_VERSION="8.7.1" SPRUCE_BIN = "/usr/local/bin/spruce" -SPRUCE_VERSION = "1.27.0" +SPRUCE_VERSION = "1.30.2" describe "cf-cli image" do before(:all) { From 8cf42888ef3b5f03ed79b85d2959002a3e6d57ff Mon Sep 17 00:00:00 2001 From: malcgds Date: Thu, 6 Jul 2023 08:03:25 +0100 Subject: [PATCH 5/9] [#185500801] Updated spruce spec --- spruce/spruce_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spruce/spruce_spec.rb b/spruce/spruce_spec.rb index 95c226be..dce725a0 100644 --- a/spruce/spruce_spec.rb +++ b/spruce/spruce_spec.rb @@ -3,7 +3,7 @@ require 'serverspec' SPRUCE_BIN = "/usr/local/bin/spruce" -SPRUCE_VERSION = "1.27.0" +SPRUCE_VERSION = "1.30.2" ALPINE_VERSION = "3.16" describe "spruce image" do @@ -28,7 +28,7 @@ def os_version end it "has the spruce version #{SPRUCE_VERSION}" do - expect(spruce_version).to match(/spruce - Version #{SPRUCE_VERSION}( \(master\))?/) + expect(spruce_version).to match(/spruce - Version v#{SPRUCE_VERSION}/) end def spruce_version From 88d0f87edf3d84c9b10c3530115547645cd67221 Mon Sep 17 00:00:00 2001 From: malcgds Date: Thu, 6 Jul 2023 08:16:40 +0100 Subject: [PATCH 6/9] [#185500801] Updated cf-cli spec --- cf-cli/cf-cli_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cf-cli/cf-cli_spec.rb b/cf-cli/cf-cli_spec.rb index ee708107..799f18b6 100644 --- a/cf-cli/cf-cli_spec.rb +++ b/cf-cli/cf-cli_spec.rb @@ -72,7 +72,7 @@ it "has the spruce version #{SPRUCE_VERSION}" do spruce_version = command("spruce --version").stdout.strip - expect(spruce_version).to match(/spruce - Version #{SPRUCE_VERSION}( \(master\))?/) + expect(spruce_version).to match(/spruce - Version v#{SPRUCE_VERSION}/) end it "has `bash` available" do From a675f5d90e01024dd189a2e2d6de633c353c21b8 Mon Sep 17 00:00:00 2001 From: Jack Joy Date: Thu, 6 Jul 2023 11:21:46 +0100 Subject: [PATCH 7/9] testing just linux/amd64 --- .github/workflows/build-image-base.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-image-base.yml b/.github/workflows/build-image-base.yml index 46c9dcd8..76ef583a 100644 --- a/.github/workflows/build-image-base.yml +++ b/.github/workflows/build-image-base.yml @@ -115,7 +115,8 @@ jobs: labels: ${{ steps.meta-ghcr.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max - platforms: ${{ inputs.platforms }} +# platforms: ${{ inputs.platforms }} + platforms: "linux/amd64" - name: Set up ruby uses: ruby/setup-ruby@v1 From bf0852e6254d801b502a3a6204b6ea5f8ad7b4e1 Mon Sep 17 00:00:00 2001 From: Jack Joy Date: Thu, 6 Jul 2023 11:26:55 +0100 Subject: [PATCH 8/9] testing just linux/arm64 --- .github/workflows/build-image-base.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-image-base.yml b/.github/workflows/build-image-base.yml index 76ef583a..de1b37f7 100644 --- a/.github/workflows/build-image-base.yml +++ b/.github/workflows/build-image-base.yml @@ -116,7 +116,7 @@ jobs: cache-from: type=gha cache-to: type=gha,mode=max # platforms: ${{ inputs.platforms }} - platforms: "linux/amd64" + platforms: "linux/arm64" - name: Set up ruby uses: ruby/setup-ruby@v1 From 24277df83e7437dac0448a59be7154fe3790b2c3 Mon Sep 17 00:00:00 2001 From: Jack Joy Date: Thu, 6 Jul 2023 12:35:14 +0100 Subject: [PATCH 9/9] testing just linux/amdwq64 --- .github/workflows/build-image-base.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-image-base.yml b/.github/workflows/build-image-base.yml index de1b37f7..6f31bc7f 100644 --- a/.github/workflows/build-image-base.yml +++ b/.github/workflows/build-image-base.yml @@ -115,8 +115,7 @@ jobs: labels: ${{ steps.meta-ghcr.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max -# platforms: ${{ inputs.platforms }} - platforms: "linux/arm64" + platforms: "linux/amd64" - name: Set up ruby uses: ruby/setup-ruby@v1