From d32dab2a039d2891188f6b1a4c066554de3fc3c6 Mon Sep 17 00:00:00 2001 From: absolutelightning Date: Tue, 11 Jul 2023 22:11:48 +0530 Subject: [PATCH] fix paths --- .github/workflows/test-integration-windows.yml | 4 ++-- Dockerfile-windows | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-integration-windows.yml b/.github/workflows/test-integration-windows.yml index 74063b41e6..65e58017ed 100644 --- a/.github/workflows/test-integration-windows.yml +++ b/.github/workflows/test-integration-windows.yml @@ -61,10 +61,10 @@ jobs: uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2 with: name: '${{ env.CONSUL_BINARY_UPLOAD_NAME }}' - path: C:\ + path: C:\bin\ - name: restore mode+x - run: chmod +x C:\consul.exe + run: chmod +x C:\bin\consul.exe - name: Setup TcpDump Docker Image shell: bash diff --git a/Dockerfile-windows b/Dockerfile-windows index 9e6f9ba376..3f4d91819e 100644 --- a/Dockerfile-windows +++ b/Dockerfile-windows @@ -40,7 +40,7 @@ EXPOSE 8500 8600 8600/udp #RUN curl %CONSUL_URL% -L -o consul.zip #RUN tar -xf consul.zip -C consul -COPY C:\\consul.exe C:\\consul +COPY C:\\bin\\consul.exe C:\\consul COPY .release/docker/docker-entrypoint-windows.sh C:\\docker-entrypoint-windows.sh ENTRYPOINT ["bash.exe", "docker-entrypoint-windows.sh"]