From 726cd4c45b7c059fae0e8a9b21fe86eece1e3db0 Mon Sep 17 00:00:00 2001
From: Jahed Ahmed <jahed@snyk.io>
Date: Mon, 10 Jan 2022 18:44:31 +0000
Subject: [PATCH] fix: rollback docker desktop to use ./docker/snyk-mac.sh

Docker Desktop configures this path per-user so migrating to something else is more complicated than just leaving it as it was.

Co-authored-by: Stefan Scherer <stefan.scherer@docker.com>
---
 .github/workflows/smoke-tests.yml                 | 11 ++++++-----
 docker-desktop/README.md                          |  2 +-
 docker-desktop/build.sh                           |  9 +++++----
 docker-desktop/src/{entrypoint.sh => snyk-mac.sh} |  0
 4 files changed, 12 insertions(+), 10 deletions(-)
 rename docker-desktop/src/{entrypoint.sh => snyk-mac.sh} (100%)

diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
index 8c3feee46f..8d0667ec57 100644
--- a/.github/workflows/smoke-tests.yml
+++ b/.github/workflows/smoke-tests.yml
@@ -92,11 +92,12 @@ jobs:
         if: ${{ matrix.snyk_install_method == 'docker-bundle' }}
         run: |
           pushd "$(mktemp -d)"
-          curl 'https://static.snyk.io/cli/latest/${{ matrix.snyk_cli_dl_file }}' | tar -xz --strip-components=1
-          ls -la
-          sudo ln -s "$(pwd)/entrypoint.sh" ./snyk
-          export PATH="$(pwd):${PATH}"
-          echo "$(pwd)" >> "${GITHUB_PATH}"
+          curl 'https://static.snyk.io/cli/latest/${{ matrix.snyk_cli_dl_file }}' | tar -xz
+          ls -la docker
+          mkdir ./bin
+          sudo ln -s "$(pwd)/docker/snyk-mac.sh" ./bin/snyk
+          export PATH="$(pwd)/bin:${PATH}"
+          echo "$(pwd)/bin" >> "${GITHUB_PATH}"
           popd
           which snyk
           snyk version
diff --git a/docker-desktop/README.md b/docker-desktop/README.md
index b047db5e03..011d757d32 100644
--- a/docker-desktop/README.md
+++ b/docker-desktop/README.md
@@ -32,5 +32,5 @@ To test it, you can do the following:
 ```sh
 cd ./binary-releases
 tar xzf snyk-for-docker-desktop-darwin-x64.tar.gz
-./snyk-for-docker-desktop-darwin-x64/entrypoint.sh woof
+./docker/snyk-mac.sh woof
 ```
diff --git a/docker-desktop/build.sh b/docker-desktop/build.sh
index bca248265d..65e4c6f9b0 100755
--- a/docker-desktop/build.sh
+++ b/docker-desktop/build.sh
@@ -8,8 +8,9 @@ node_url="https://nodejs.org/dist/${node_version}/node-${node_version}-${platfor
 build_name="snyk-for-docker-desktop-${platform}-${arch}"
 build_filename="${build_name}.tar.gz"
 build_sha_filename="${build_filename}.sha256"
-build_root="./docker-desktop/dist"
-build_dir="${build_root}/${build_name}"
+build_root="./docker-desktop/dist/${build_name}"
+build_dir_name="docker"
+build_dir="${build_root}/${build_dir_name}"
 output_dir="./binary-releases"
 
 if [[ -d "${build_dir}" ]]; then
@@ -22,7 +23,7 @@ mkdir -p "${build_dir}"
 mkdir -p "${output_dir}"
 
 # Include entrypoint.
-cp ./docker-desktop/src/entrypoint.sh "${build_dir}"
+cp ./docker-desktop/src/snyk-mac.sh "${build_dir}"
 
 # Include Snyk CLI build.
 cp              ./package.json        "${build_dir}"
@@ -47,7 +48,7 @@ popd
 # We build from build_root so that build_name is the top-level directory in the
 # tarball. We want a top-level directory to avoid tarbombs.
 pushd "${build_root}"
-tar czfh "${build_filename}" "${build_name}"
+tar czfh "${build_filename}" "${build_dir_name}"
 shasum -a 256 "${build_filename}" > "${build_sha_filename}"
 popd
 
diff --git a/docker-desktop/src/entrypoint.sh b/docker-desktop/src/snyk-mac.sh
similarity index 100%
rename from docker-desktop/src/entrypoint.sh
rename to docker-desktop/src/snyk-mac.sh