(chocolateyGH-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.
TheCakeIsNaOH · Oct 4, 2019 · 5f88ef5 · 5f88ef5
1 parent 3e40eb3
commit 5f88ef5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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