a

.github/workflows/centos7.yml

@@ -76,16 +76,16 @@ jobs:
 
       - name: create vcpkg cache dir
         run: |
-          echo "VCPKG_CACHE_DIR=$GITHUB_WORKSPACE/vcpkg_cache" >> $GITHUB_ENV
-          mkdir -p ${{ github.workspace }}/vcpkg_cache
+          echo "VCPKG_CACHE_DIR=$GITHUB_WORKSPACE/docker/vcpkg_cache" >> $GITHUB_ENV
+          mkdir -p ${{ github.workspace }}/docker/vcpkg_cache
 
 
       - name: Restore vcpkg binary dir from cache
         id: cache-vcpkg-binary
         # Note: we are stuck with v3, because v4 is not compatible with oracle8 image
         uses: actions/cache/restore@v3
         with:
-          path: ${{ github.workspace }}/vcpkg_cache
+          path: ${{ github.workspace }}/docker/vcpkg_cache
           key: vcpkg-cache-centos7-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }}
           # Allows to restore a cache when deps have only partially changed (like adding a dependency)
           restore-keys: vcpkg-cache-centos7-
@@ -96,7 +96,7 @@ jobs:
           -t antares:centos7  \
           --build-arg="BRANCH=${{ env.REF }}" \
           --build-arg="NPROC=$(nproc)" \
-          --build-arg="VCPKG_CACHE_DIR=${{ github.workspace }}/vcpkg_cache" \
+          --build-arg="VCPKG_CACHE_DIR=${{ github.workspace }}/docker/vcpkg_cache" \
           -f ${{ env.DOCKERFILE }} .
 
 
@@ -128,6 +128,6 @@ jobs:
         id: save-cache-vcpkg-binary
         uses: actions/cache/save@v3
         with:
-          path: ${{ github.workspace }}/vcpkg_cache
+          path: ${{ github.workspace }}/docker/vcpkg_cache
           key: vcpkg-cache-centos7-${{ hashFiles('src/vcpkg.json', '.git/modules/vcpkg/HEAD') }}
 

docker/Dockerfile

@@ -14,7 +14,7 @@ SHELL ["/bin/bash", "--login", "-c"]
 ENV VCPKG_BINARY_SOURCES="clear;files,/workspace/vcpkg_cache,readwrite"
 RUN mkdir -p /workspace/vcpkg_cache
 ARG VCPKG_CACHE_DIR
-COPY ${VCPKG_CACHE_DIR} /workspace/vcpkg_cache/
+COPY $VCPKG_CACHE_DIR /workspace/vcpkg_cache/
 
 ARG BRANCH=develop
 RUN cd /workspace && \