das-node-55: use bind volume for bazel cache

singnet · Oct 31, 2024 · 6b9be92 · 6b9be92
1 parent 7187c44
commit 6b9be92
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -43,6 +43,7 @@ jobs:
           path: |
             build
             bazel_assets
+            docker/volumes/bazel_cache
           key: ${{ runner.os }}-cpp-build-${{ hashFiles('**/CMakeLists.txt') }}-${{ hashFiles('**/*.cpp') }}
           restore-keys: |
             ${{ runner.os }}-cpp-build-${{ hashFiles('**/CMakeLists.txt') }}
@@ -135,7 +136,7 @@ jobs:
             ${{ runner.os }}-cpp-build
 
       - name: Download wheeler artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: wheelers
           path: dist

diff --git a/.gitignore b/.gitignore
@@ -26,6 +26,7 @@ share/python-wheels/
 .installed.cfg
 *.egg
 MANIFEST
+docker/volumes/
 
 # PyInstaller
 #  Usually these files are written by a python script from a template

diff --git a/Makefile b/Makefile
@@ -27,5 +27,4 @@ test-all: test-cpp test-python
 
 # Clean docker volumes and build directories
 clean:
-	@docker volume rm bazel_cache
-	@rm -rf src/bazel-* bazel_assets build dist
+	@rm -rf src/bazel-* bazel_assets build dist docker/volmes/bazel_cache
diff --git a/scripts/cpp_build.sh b/scripts/cpp_build.sh
@@ -5,7 +5,7 @@ CONTAINER_NAME="das-node-build"
 docker run \
   --rm \
   --name=$CONTAINER_NAME \
-  --mount type=volume,source=bazel_cache,target=/root/.cache/bazel \
+  --volume ./docker/volumes/bazel_cache:/root/.cache/bazel \
   --volume .:/opt/hyperon_das_node \
   --workdir /opt/hyperon_das_node/src \
   das-node-builder \

diff --git a/scripts/cpp_test.sh b/scripts/cpp_test.sh
@@ -5,7 +5,7 @@ CONTAINER_NAME="das-node-cpp-test"
 docker run \
   --rm \
   --name=$CONTAINER_NAME \
-  --mount type=volume,source=bazel_cache,target=/root/.cache/bazel \
+  --volume ./docker/volumes/bazel_cache:/root/.cache/bazel \
   --volume .:/opt/hyperon_das_node \
   --workdir /opt/hyperon_das_node/src \
   das-node-builder \

diff --git a/scripts/wheeler_test.sh b/scripts/wheeler_test.sh
@@ -9,7 +9,7 @@ CONTAINER_NAME="das-node-wheeler-test"
 docker run \
   --rm \
   --name=$CONTAINER_NAME \
-  --mount type=volume,source=bazel_cache,target=/root/.cache/bazel \
+  --volume ./docker/volumes/bazel_cache:/root/.cache/bazel \
   --volume .:/opt/hyperon_das_node \
   --workdir /opt/hyperon_das_node \
   das-node-builder \