From ef2bda7bc94e48f55c6443527c5a4201b5c59cac Mon Sep 17 00:00:00 2001 From: Craig Colegrove <craig.colegrove@ironcorelabs.com> Date: Mon, 8 Jul 2024 14:43:09 -0700 Subject: [PATCH 1/2] Allow Scala CI to use specific Docker version --- .github/workflows/scala-ci.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/scala-ci.yaml b/.github/workflows/scala-ci.yaml index 3a5f8a1..781b950 100644 --- a/.github/workflows/scala-ci.yaml +++ b/.github/workflows/scala-ci.yaml @@ -32,6 +32,11 @@ on: type: string required: false default: "" + docker_version: + description: Install a specific Docker version. Useful as a workaround for a `docker-it-scala` bug with Docker v26. + type: string + required: false + default: "" secrets: MAVEN_IRONCORELABS_COM_AWS_ACCESS_KEY_ID: description: "AWS access key to access our s3 bucket for scala libs." @@ -63,6 +68,11 @@ jobs: repository: ${{ inputs.download_release_binary_repo }} fileName: ${{ inputs.download_release_binary_name }} latest: true + - name: Install specific Docker version + if: inputs.docker_version != '' + uses: docker-practice/actions-setup-docker@v1 + with: + docker_version: ${{ inputs.docker_version }} - name: Build and test env: MAVEN_IRONCORELABS_COM_AWS_ACCESS_KEY_ID: ${{ secrets.MAVEN_IRONCORELABS_COM_AWS_ACCESS_KEY_ID }} From f8b43c6eabc0de8052578f780ceecbe48ca84447 Mon Sep 17 00:00:00 2001 From: Craig Colegrove <craig.colegrove@ironcorelabs.com> Date: Mon, 8 Jul 2024 14:52:11 -0700 Subject: [PATCH 2/2] Try newer version --- .github/workflows/scala-ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scala-ci.yaml b/.github/workflows/scala-ci.yaml index 781b950..c01bb5a 100644 --- a/.github/workflows/scala-ci.yaml +++ b/.github/workflows/scala-ci.yaml @@ -70,7 +70,7 @@ jobs: latest: true - name: Install specific Docker version if: inputs.docker_version != '' - uses: docker-practice/actions-setup-docker@v1 + uses: docker-practice/actions-setup-docker@ccc771627519a0dc44b99c63f3ccf5fab1b1b9b8 with: docker_version: ${{ inputs.docker_version }} - name: Build and test