Skip to content

Commit 87f1af9

Browse files
committed
correct line order
1 parent b287e93 commit 87f1af9

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

.github/actions/openziti-tunnel-build-action/redhat-8/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ RUN curl -sSfL https://cmake.org/files/v${CMAKE_VERSION%.*}/cmake-${CMAKE_VERSIO
4040

4141
ENV VCPKG_ROOT=/usr/local/vcpkg
4242
# this must be set on arm. see https://learn.microsoft.com/en-us/vcpkg/users/config-environment#vcpkg_force_system_binaries
43-
ENV VCPKG_BINARY_SOURCES="clear;files,/github/workspace/vcpkg_cache,readwrite"
4443
ENV VCPKG_FORCE_SYSTEM_BINARIES=yes
44+
ENV VCPKG_BINARY_SOURCES="clear;files,/github/workspace/vcpkg_cache,readwrite"
4545

4646
RUN cd /usr/local \
4747
&& git clone https://github.com/microsoft/vcpkg \

.github/actions/openziti-tunnel-build-action/redhat-9/Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,9 @@ RUN curl -sSfL https://cmake.org/files/v${CMAKE_VERSION%.*}/cmake-${CMAKE_VERSIO
4343
ENV GIT_CONFIG_GLOBAL="/tmp/ziti-builder-gitconfig"
4444

4545
ENV VCPKG_ROOT=/usr/local/vcpkg
46-
ENV VCPKG_BINARY_SOURCES="clear;files,/github/workspace/vcpkg_cache,readwrite"
47-
4846
# this must be set on arm. see https://learn.microsoft.com/en-us/vcpkg/users/config-environment#vcpkg_force_system_binaries
4947
ENV VCPKG_FORCE_SYSTEM_BINARIES=yes
48+
ENV VCPKG_BINARY_SOURCES="clear;files,/github/workspace/vcpkg_cache,readwrite"
5049

5150
RUN cd /usr/local \
5251
&& git clone https://github.com/microsoft/vcpkg \

.github/actions/openziti-tunnel-build-action/ubuntu-20.04/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ RUN curl -sSfL https://cmake.org/files/v${CMAKE_VERSION%.*}/cmake-${CMAKE_VERSIO
5454
&& rm cmake.sh
5555

5656
ENV VCPKG_ROOT=/usr/local/vcpkg
57-
ENV VCPKG_BINARY_SOURCES="clear;files,/github/workspace/vcpkg_cache,readwrite"
5857
# this must be set on arm. see https://learn.microsoft.com/en-us/vcpkg/users/config-environment#vcpkg_force_system_binaries
5958
ENV VCPKG_FORCE_SYSTEM_BINARIES=yes
59+
ENV VCPKG_BINARY_SOURCES="clear;files,/github/workspace/vcpkg_cache,readwrite"
6060

6161
RUN cd /usr/local \
6262
&& git clone https://github.com/microsoft/vcpkg \

.github/actions/openziti-tunnel-build-action/ubuntu-22.04/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ RUN curl -sSfL "https://cmake.org/files/v${CMAKE_VERSION%.*}/cmake-${CMAKE_VERSI
5959
&& rm cmake.sh
6060

6161
ENV VCPKG_ROOT=/usr/local/vcpkg
62-
ENV VCPKG_BINARY_SOURCES="clear;files,/github/workspace/vcpkg_cache,readwrite"
6362
# this must be set on arm. see https://learn.microsoft.com/en-us/vcpkg/users/config-environment#vcpkg_force_system_binaries
6463
ENV VCPKG_FORCE_SYSTEM_BINARIES=yes
64+
ARG VCPKG_BINARY_SOURCES="clear;files,/github/workspace/vcpkg_cache,readwrite"
6565

6666
RUN cd /usr/local \
6767
&& git clone https://github.com/microsoft/vcpkg \

0 commit comments

Comments
 (0)