From 190c600d0b745cf8cecc4da728dd6c80a767e617 Mon Sep 17 00:00:00 2001 From: Gabriele Oliaro Date: Wed, 19 Jul 2023 18:18:28 -0400 Subject: [PATCH 1/2] Docker fix (#874) --- .github/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 280539eb5f..d059a0605f 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -44,7 +44,7 @@ jobs: env: FF_GPU_BACKEND: ${{ matrix.gpu_backend }} cuda_version: ${{ matrix.cuda_version }} - branch_name: ${GITHUB_REF#refs/heads/} + branch_name: ${{ github.head_ref || github.ref_name }} steps: - name: Checkout Git Repository uses: actions/checkout@v3 From 7da2fdd16377d3926ec316bff91b727e6beb46fd Mon Sep 17 00:00:00 2001 From: DerrickYLJ <99985904+DerrickYLJ@users.noreply.github.com> Date: Fri, 21 Jul 2023 00:09:02 -0400 Subject: [PATCH 2/2] Docker Inspect Error Msg Prinitng Fix (#879) * docker insepct fix * bug fix * bug fix * bug fix * bug fix * bug fix --- docker/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/run.sh b/docker/run.sh index fd7550afc8..307628f4fd 100755 --- a/docker/run.sh +++ b/docker/run.sh @@ -58,8 +58,8 @@ else cuda_version_hyphen="" fi -# Check that image exists -if docker image inspect "${image}-${FF_GPU_BACKEND}${cuda_version_hyphen}":latest > /dev/null || true ; then +# Check that image exists, if fails, print the default error message. +if [[ "$(docker images -q "$image"-"$FF_GPU_BACKEND""$cuda_version_hyphen":latest 2> /dev/null)" == "" ]]; then echo "" echo "To download the docker image, run:" echo " FF_GPU_BACKEND=${FF_GPU_BACKEND} cuda_version=${cuda_version} $(pwd)/pull.sh $image"