Merge branch 'main' into bump_version

automesh-network · Oct 23, 2024 · 345eebc · 345eebc
2 parents c84ad77 + 0eaf0c6
commit 345eebc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/actions/docker-build-push/action.yml b/.github/actions/docker-build-push/action.yml
@@ -41,7 +41,7 @@ runs:
           docker build \
             --build-arg VCPKG_BINARY_SOURCES="clear;x-gha,readwrite" \
             --build-arg ACTIONS_CACHE_URL="${{ env.ACTIONS_CACHE_URL }}" \
-            --build-arg ACTIONS_CACHE_URL="${{ env.ACTIONS_RUNTIME_TOKEN }}" \
+            --build-arg ACTIONS_RUNTIME_TOKEN="${{ env.ACTIONS_RUNTIME_TOKEN }}" \
             -t "${{ inputs.registry }}/${{ inputs.image }}:${{ inputs.tag }}" ${{ inputs.context }}
         shell: ${{ inputs.shell }}
 

diff --git a/win-alrd-rsxe/Dockerfile b/win-alrd-rsxe/Dockerfile
@@ -1,5 +1,8 @@
 FROM ghcr.io/automesh-network/dockerfiles:win-dev-rust
 
+ARG VCPKG_BINARY_SOURCES=
+ARG ACTIONS_CACHE_URL=
+ARG ACTIONS_RUNTIME_TOKEN=
 RUN vcpkg install openssl:x64-windows openssl:x64-windows-static openssl:x64-windows-static-md
 RUN vcpkg install openssl:x86-windows openssl:x86-windows-static openssl:x86-windows-static-md
 RUN vcpkg install openssl:arm64-windows openssl:arm64-windows-static openssl:arm64-windows-static-md