[CONSUL-428] Add Socat to single container (#54)

hashicorp · Dec 21, 2022 · 146347f · 146347f
1 parent 0ea0a79
commit 146347f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/build-support-windows/Dockerfile-consul-local-windows b/build-support-windows/Dockerfile-consul-local-windows
@@ -33,6 +33,12 @@ RUN tar -xf jaeger.tar.gz -C jaeger --strip-components=1
 # Copy test-sds-server binary and certs
 COPY --from=test-sds-server ["C:/go/src/", "C:/test-sds-server/"]
 
+# Install Socat
+ENV SOCAT_URL=https://github.com/tech128/socat-1.7.3.0-windows/archive/refs/heads/master.zip
+RUN curl %SOCAT_URL% -L -o socat.zip
+RUN mkdir socat
+RUN tar -xf socat.zip -C socat --strip-components=1
+
 EXPOSE 8300
 EXPOSE 8301 8301/udp 8302 8302/udp
 EXPOSE 8500 8600 8600/udp
@@ -42,4 +48,4 @@ EXPOSE 19000 19001 19002 19003 19004
 EXPOSE 21000 21001 21002 21003 21004
 EXPOSE 5000 1234 2345
 
-RUN SETX /M path "%PATH%;C:\consul;C:\envoy;C:\fortio;C:\jaeger;C:\Program Files\Git\bin;C:\Program Files\OpenSSL-Win64\bin;C:\bats\bin\bats;C:\ProgramData\chocolatey\lib\jq\tools;"
+RUN SETX /M path "%PATH%;C:\consul;C:\envoy;C:\fortio;C:\jaeger;C:\Program Files\Git\bin;C:\Program Files\OpenSSL-Win64\bin;C:\bats\bin\bats;C:\ProgramData\chocolatey\lib\jq\tools;C:\socat;"
diff --git a/build-support-windows/build-images.sh b/build-support-windows/build-images.sh
@@ -39,9 +39,4 @@ docker tag mcr.microsoft.com/oss/kubernetes/pause:3.6 "${HASHICORP_DOCKER_PROXY}
 # Build Windows Openzipkin Image
 docker build -t "${HASHICORP_DOCKER_PROXY}/windows/openzipkin" -f Dockerfile-openzipkin-windows .
 
-# Build Windows Socat Image
-echo " "
-echo "Build Windows Socat Image"
-docker build -t "${HASHICORP_DOCKER_PROXY}/windows/socat" -f Dockerfile-socat-windows .
-
 echo "Building Complete!"