[CONSUL-530] Update default consul version 1.13.3

hashicorp · Nov 2, 2022 · e048b1c · e048b1c
1 parent 17abf23
commit e048b1c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/Dockerfile-windows b/Dockerfile-windows
@@ -1,5 +1,5 @@
 FROM docker.mirror.hashicorp.services/windows/servercore:1809
-ARG VERSION=1.13.1
+ARG VERSION=1.13.3
 
 LABEL org.opencontainers.image.authors="Consul Team <[email protected]>" \
       org.opencontainers.image.url="https://www.consul.io/" \

diff --git a/build-support-windows/Dockerfile-consul-dev-windows b/build-support-windows/Dockerfile-consul-dev-windows
@@ -1,4 +1,4 @@
-ARG VERSION=1.13.1
+ARG VERSION=1.13.3
 
 FROM windows/consul:${VERSION}-local
 COPY dist/ C:\\consul
diff --git a/build-support-windows/Dockerfile-consul-local-windows b/build-support-windows/Dockerfile-consul-local-windows
@@ -1,4 +1,4 @@
-ARG VERSION=1.13.1
+ARG VERSION=1.13.3
 
 FROM windows/test-sds-server as test-sds-server
 FROM docker.mirror.hashicorp.services/windows/openzipkin as openzipkin
@@ -13,6 +13,7 @@ RUN tar -xf fortio.zip -C fortio
 RUN choco install openssl -yf
 RUN choco install jq -yf
 RUN choco install netcat -yf
+RUN choco install openjdk -yf
 
 # Install Bats
 ENV BATS_URL=https://github.com/bats-core/bats-core/archive/refs/tags/v1.7.0.zip
@@ -38,7 +39,6 @@ COPY --from=test-sds-server ["C:/go/src/", "C:/test-sds-server/"]
 
 # Copy openzipkin .jar file
 COPY --from=openzipkin ["C:/zipkin", "C:/zipkin"]
-COPY --from=openzipkin ["C:/openjdk-18", "C:/openjdk-18"]
 
 EXPOSE 8300
 EXPOSE 8301 8301/udp 8302 8302/udp
@@ -49,4 +49,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:\fortio;C:\jaeger;C:\Program Files\Git\bin;C:\Program Files\Git\usr\bin;C:\Program Files\OpenSSL-Win64\bin;C:\bats\bin\;C:\ProgramData\chocolatey\lib\jq\tools;C:\socat;C:\openjdk-18\bin"
+RUN SETX /M path "%PATH%;C:\consul;C:\fortio;C:\jaeger;C:\Program Files\Git\bin;C:\Program Files\Git\usr\bin;C:\Program Files\OpenSSL-Win64\bin;C:\bats\bin\;C:\ProgramData\chocolatey\lib\jq\tools;C:\socat"
diff --git a/build-support-windows/build-consul-dev-image.sh b/build-support-windows/build-consul-dev-image.sh
@@ -4,7 +4,7 @@ cd ../
 rm -rf dist
 
 export GOOS=windows GOARCH=amd64
-VERSION=1.13.2
+VERSION=1.13.3
 CONSUL_BUILDDATE=$(date +"%Y-%m-%dT%H:%M:%SZ")
 GIT_IMPORT=github.com/hashicorp/consul/version
 GOLDFLAGS=" -X $GIT_IMPORT.Version=$VERSION -X $GIT_IMPORT.VersionPrerelease=dev -X $GIT_IMPORT.BuildDate=$CONSUL_BUILDDATE "

diff --git a/build-support-windows/build-consul-local-images.sh b/build-support-windows/build-consul-local-images.sh
@@ -2,11 +2,11 @@
 
 readonly HASHICORP_DOCKER_PROXY="docker.mirror.hashicorp.services"
 
-# Build Consul Version 1.13.2 / 1.12.4 / 1.11.8
-VERSION=${VERSION:-"1.13.2"}
+# Build Consul Version 1.13.3 / 1.12.6 / 1.11.11
+VERSION=${VERSION:-"1.13.3"}
 export VERSION
 
-# Build Windows Envoy Version 1.23.1 / 1.21.4 / 1.19.5
+# Build Windows Envoy Version 1.23.1 / 1.21.5 / 1.20.7
 ENVOY_VERSION=${ENVOY_VERSION:-"1.23.1"}
 export ENVOY_VERSION
 

diff --git a/test/integration/connect/envoy/Dockerfile-consul-envoy-windows b/test/integration/connect/envoy/Dockerfile-consul-envoy-windows
@@ -1,6 +1,6 @@
-# From Consul Version 1.13.2 / 1.12.4 / 1.11.8
-ARG VERSION=1.13.2-local
-# From Envoy version 1.23.1 / 1.22.3 / 1.21.4 / 1.20.6 / 1.19.5
+# From Consul Version 1.13.3 / 1.12.6 / 1.11.11
+ARG VERSION=1.13.3-dev
+# From Envoy version 1.23.1 / 1.21.5 / 1.20.7
 ARG ENVOY_VERSION
 
 FROM docker.mirror.hashicorp.services/windows/envoy-windows:v${ENVOY_VERSION} as envoy