From d5dc1a30b5aa26653a7ba66784c3b04c52c879fc Mon Sep 17 00:00:00 2001 From: CrazyMax Date: Fri, 9 Sep 2022 16:31:14 +0200 Subject: [PATCH] ci(dockerd): fix symlink with dockerd bundle Signed-off-by: CrazyMax (cherry picked from commit e870da7be2c9cdc8e6bfb5c9ef1510de600dd1e1) Signed-off-by: Sebastiaan van Stijn --- .github/workflows/dockerd.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dockerd.yml b/.github/workflows/dockerd.yml index f730dd286299..a4e13c108614 100644 --- a/.github/workflows/dockerd.yml +++ b/.github/workflows/dockerd.yml @@ -57,12 +57,12 @@ jobs: target: binary outputs: /tmp/moby - - # FIXME: remove symlink and rename bin. should be fixed upstream on moby. name: Rename binary if: steps.build.outputs.result == 'true' run: | - rm /tmp/moby/binary-daemon/dockerd - mv /tmp/moby/binary-daemon/dockerd-dev /tmp/moby/binary-daemon/dockerd + if [ -L "/tmp/moby/binary-daemon/dockerd" ]; then + mv -f $(readlink /tmp/moby/binary-daemon/dockerd) /tmp/moby/binary-daemon/dockerd + fi - name: Download if: steps.build.outputs.result != 'true'