From 5f88ef529dcb6555c37be4ff29bde45094515b9d Mon Sep 17 00:00:00 2001 From: TheCakeIsNaOH <38865330+TheCakeIsNaOH@users.noreply.github.com> Date: Thu, 3 Oct 2019 20:47:39 -0500 Subject: [PATCH] (GH-1020) Docker use code_drop instead of build_output This changes the docker container to use code_drop folder instead of the build_output folder. The zip.sh script uses the code_drop rather then build_output, and the docker container should follow what format the zip has. The wrapper script also changes due to choco.exe being one more folder down. --- docker/Dockerfile.linux | 2 +- docker/choco_wrapper | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile.linux b/docker/Dockerfile.linux index 4590577b09..fdcd17f75d 100644 --- a/docker/Dockerfile.linux +++ b/docker/Dockerfile.linux @@ -10,7 +10,7 @@ RUN chmod +x zip.sh RUN ./build.sh WORKDIR /usr/local/bin -RUN ln -s /usr/local/src/choco/build_output/chocolatey +RUN ln -s /usr/local/src/choco/code_drop/chocolatey COPY docker/choco_wrapper /usr/local/bin/choco diff --git a/docker/choco_wrapper b/docker/choco_wrapper index 3aa86b5e5c..745cdf43ce 100755 --- a/docker/choco_wrapper +++ b/docker/choco_wrapper @@ -1,3 +1,3 @@ #!/bin/bash -mono /usr/local/bin/chocolatey/choco.exe "$@" --allow-unofficial +mono /usr/local/bin/chocolatey/console/choco.exe "$@" --allow-unofficial