diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 7582a0eb..9341776f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -34,21 +34,21 @@ jobs: - uses: docker/setup-buildx-action@v1 - name: Detect correct Git ref for image build - id: gitref + id: git uses: actions/github-script@v3 with: - result-encoding: string script: | - let ref = 'HEAD'; + let out = {ref: 'HEAD', ver: ''}; if ('${{ github.ref }}'.startsWith('refs/tags/docker/')) { - ref = '${{ github.ref }}'.substring(17).split('-')[0]; + out.ref = '${{ github.ref }}'.substring(17).split('-')[0]; + out.ver = out.ref; } - return ref; + return out; - name: Pre-build fresh Docker images cache run: make docker.build.cache no-cache=yes DOCKERFILE=${{ matrix.dockerfile }} - ref=${{ steps.gitref.outputs.result }} + ref=${{ fromJSON(steps.git.outputs.result).ref }} working-directory: ./docker/coturn if: ${{ !matrix.cache }} @@ -62,7 +62,7 @@ jobs: - name: Pre-build Docker images cache run: make docker.build.cache no-cache=no DOCKERFILE=${{ matrix.dockerfile }} - ref=${{ steps.gitref.outputs.result }} + ref=${{ fromJSON(steps.git.outputs.result).ref }} working-directory: ./docker/coturn if: ${{ matrix.cache }} @@ -76,6 +76,8 @@ jobs: make npm.install make test.docker platforms=@all build=yes DOCKERFILE=${{ matrix.dockerfile }} + env: + COTURN_VERSION: ${{ fromJSON(steps.git.outputs.result).ver }} working-directory: ./docker/coturn - name: Login to GitHub Container Registry diff --git a/docker/coturn/tests/main.bats b/docker/coturn/tests/main.bats index acfc0d9f..846c67fd 100644 --- a/docker/coturn/tests/main.bats +++ b/docker/coturn/tests/main.bats @@ -30,7 +30,7 @@ } @test "Coturn has correct version" { - [ -z "$COTURN_VER" ] && skip + [ -z "$COTURN_VERSION" ] && skip run docker run --rm --entrypoint sh $IMAGE -c \ "turnserver -o --log-file=stdout | grep 'Version Coturn' \