From de4191097c067801b43034538a716bb5f0d10767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ezequiel=20Fern=C3=A1ndez=20Ponce?= <20102608+ezfepo@users.noreply.github.com> Date: Wed, 14 Sep 2022 09:45:57 -0300 Subject: [PATCH] [CONSUL-438] Add netcat (nc) in the Single container Dockerfile (#56) --- build-support-windows/BUILD-IMAGES.md | 27 ------------------- .../Dockerfile-consul-local-windows | 1 + .../Dockerfile-socat-windows | 12 --------- 3 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 build-support-windows/Dockerfile-socat-windows diff --git a/build-support-windows/BUILD-IMAGES.md b/build-support-windows/BUILD-IMAGES.md index 7bea80ecdc..8a58cf111e 100644 --- a/build-support-windows/BUILD-IMAGES.md +++ b/build-support-windows/BUILD-IMAGES.md @@ -6,7 +6,6 @@ - [Consul-windows](#consul-windows) - [Dockerfile-consul-local-windows](#dockerfile-consul-local-windows) - [Dockerfile-openzipkin-windows](#dockerfile-openzipkin-windows) -- [Dockerfile-socat-windows](#dockerfile-socat-windows) - [Build images](#build-images) ## About this File @@ -75,32 +74,6 @@ If everything works as it should, you will see the zipkin logo being displayed, 20XX-XX-XX XX:XX:XX.XXX INFO [/] 1252 --- [oss-http-*:9411] c.l.a.s.Server : Serving HTTP at /[0:0:0:0:0:0:0:0]:9411 - http://127.0.0.1:9411/ ``` -## Dockerfile-socat-windows - -The alpine:socat image was replaced by a windows core image to which a precompiled version of Socat was installed. - -The windows base used was: `mcr.microsoft.com/windows/servercore:1809` - -The compiled windows version of Socat can be found in the repository [https://github.com/tech128/socat-1.7.3.0-windows](https://github.com/tech128/socat-1.7.3.0-windows) - -To build this image you need to run the following command on your terminal: - -```shell -docker build -t socat -f Dockerfile-socat-windows . -``` - -You can test the built file by running the following command: - -```shell -docker run --rm --name socat socat -``` - -If everything works properly you should get the following output: - -```shell -20XX/XX/XX XX:XX:XX socat[1292] E exactly 2 addresses required (there are 0); use option "-h" for help -``` - ## Build images To build the images, it is necessary to open a Git bash terminal and run diff --git a/build-support-windows/Dockerfile-consul-local-windows b/build-support-windows/Dockerfile-consul-local-windows index b65510f3dd..346e22c493 100644 --- a/build-support-windows/Dockerfile-consul-local-windows +++ b/build-support-windows/Dockerfile-consul-local-windows @@ -16,6 +16,7 @@ COPY --from=envoy ["C:/Program Files/envoy/", "C:/envoy/"] RUN choco install openssl -yf RUN choco install jq -yf +RUN choco install netcat -yf # Install Bats ENV BATS_URL=https://github.com/bats-core/bats-core/archive/refs/tags/v1.7.0.zip diff --git a/build-support-windows/Dockerfile-socat-windows b/build-support-windows/Dockerfile-socat-windows deleted file mode 100644 index 90a711e0a2..0000000000 --- a/build-support-windows/Dockerfile-socat-windows +++ /dev/null @@ -1,12 +0,0 @@ -FROM mcr.microsoft.com/windows/servercore:1809 - -RUN mkdir 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 tar -xf socat.zip -C socat --strip-components=1 - -ENV PATH C:\\socat;%PATH% - -ENTRYPOINT ["socat.exe"] \ No newline at end of file