From 7c0eca736887100a171fadfeffc8dea1d73b6876 Mon Sep 17 00:00:00 2001 From: Martin Schulze Date: Mon, 25 Jul 2022 20:28:51 +0200 Subject: [PATCH 1/3] Docker: Add *-no-faccessat2 tags see https://github.com/bats-core/bats-core/issues/551#issuecomment-1192982046 --- .github/workflows/release_dockerhub.yml | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release_dockerhub.yml b/.github/workflows/release_dockerhub.yml index 584c9b9bb4..da36ed24f8 100644 --- a/.github/workflows/release_dockerhub.yml +++ b/.github/workflows/release_dockerhub.yml @@ -13,26 +13,36 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 + - id: version run: | EXPECTED_VERSION=${{ github.event.inputs.version }} TAG_VERSION=${GITHUB_REF#refs/tags/v} # refs/tags/v1.2.3 -> 1.2.3 echo ::set-output name=version::${EXPECTED_VERSION:-$TAG_VERSION} - - - name: Set up QEMU + - name: Set up QEMU uses: docker/setup-qemu-action@v1 - - - name: Login to DockerHub + + + - name: Login to DockerHub uses: docker/login-action@v1 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Set up Docker Buildx + + - name: Set up Docker Buildx id: buildx uses: docker/setup-buildx-action@v1 + - uses: docker/build-push-action@v2 with: platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6 tags: ${{ secrets.DOCKER_USERNAME }}/bats:${{ steps.version.outputs.version }},${{ secrets.DOCKER_USERNAME }}/bats:latest push: true + + - uses: docker/build-push-action@v2 + with: + platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6 + tags: ${{ secrets.DOCKER_USERNAME }}/bats:${{ steps.version.outputs.version }}-no-faccessat2,${{ secrets.DOCKER_USERNAME }}/bats:latest-no-faccessat2 + push: true + build-args: + - bashver: 5.1.4 From 76542f1259a56829e229259718dad36556f9731d Mon Sep 17 00:00:00 2001 From: Martin Schulze Date: Mon, 25 Jul 2022 20:29:03 +0200 Subject: [PATCH 2/3] Fix syntax --- .github/workflows/release_dockerhub.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/release_dockerhub.yml b/.github/workflows/release_dockerhub.yml index da36ed24f8..e5faec1c89 100644 --- a/.github/workflows/release_dockerhub.yml +++ b/.github/workflows/release_dockerhub.yml @@ -44,5 +44,4 @@ jobs: platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x,linux/386,linux/arm/v7,linux/arm/v6 tags: ${{ secrets.DOCKER_USERNAME }}/bats:${{ steps.version.outputs.version }}-no-faccessat2,${{ secrets.DOCKER_USERNAME }}/bats:latest-no-faccessat2 push: true - build-args: - - bashver: 5.1.4 + build-args: bashver=5.1.4 From 85fdd70573e4e9bc337849e6b67047f98f9fe76c Mon Sep 17 00:00:00 2001 From: Martin Schulze Date: Mon, 25 Jul 2022 20:40:44 +0200 Subject: [PATCH 3/3] Add changelog entry for #622 --- docs/CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 20bd8107cb..2b3ada7ebc 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -17,6 +17,9 @@ The format is based on [Keep a Changelog][kac] and this project adheres to * running only tests that failed in the last run via `--filter-status failed` (#483) * variable `BATS_TEST_RETRIES` that specifies how often a test should be reattempted before it is considered failed (#618) +* Docker tags `latest-no-faccessat2` and `-no-faccessat2` for + avoiding `bash: bats: No such file or directory` on `docker<20.10` (or + `runc