Merge branch 'master' into dependabot/npm_and_yarn/compose/neurosynth…

…-frontend/nanoid-3.3.8
neurostuff · Jan 10, 2025 · 6a49680 · 6a49680
2 parents ef6c816 + 7d66822
commit 6a49680
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -43,12 +43,13 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/bake-action@master
+        uses: docker/bake-action@v6.0.0
         with:
           files: docker-compose.yml,docker-compose.dev.yml
           push: true
           load: false
           workdir: compose
+          source: "{{defaultContext}}:compose"
           set: |
               compose.tags=ghcr.io/${{ github.repository_owner }}/neurosynth_compose:${{ hashFiles('**/compose/neurosynth_compose/**') }}
               compose.cache-from=type=registry,ref=ghcr.io/${{ github.repository_owner }}/neurosynth_compose:${{ hashFiles('**/compose/neurosynth_compose/**') }}
@@ -94,12 +95,13 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
       -
         name: Build and push
-        uses: docker/bake-action@master
+        uses: docker/bake-action@v6.0.0
         with:
           files: docker-compose.yml,docker-compose.dev.yml
           push: true
           load: false
           workdir: store
+          source: "{{defaultContext}}:store"
           set: |
               neurostore.tags=ghcr.io/${{ github.repository_owner }}/neurostore:${{ hashFiles('**/store/neurostore/**') }}
               neurostore.cache-from=type=registry,ref=ghcr.io/${{ github.repository_owner }}/neurostore:${{ hashFiles('**/store/neurostore/**') }}
@@ -136,12 +138,13 @@ jobs:
           cp .env.example .env
       -
         name: load images
-        uses: docker/bake-action@master
+        uses: docker/bake-action@v6.0.0
         with:
           files: docker-compose.yml,docker-compose.dev.yml
           push: false
           load: true
           workdir: store
+          source: "{{defaultContext}}:store"
           set: |
               neurostore.cache-from=type=gha,scope=cached-neurostore
               store_nginx.cache-from=type=gha,scope=cached-store-nginx
@@ -205,12 +208,13 @@ jobs:
         cp .env.example .env
     -
       name: load images
-      uses: docker/bake-action@master
+      uses: docker/bake-action@v6.0.0
       with:
         files: docker-compose.yml,docker-compose.dev.yml
         push: false
         load: true
         workdir: compose
+        source: "{{defaultContext}}:compose"
         set: |
             compose.cache-from=type=gha,scope=cached-compose
             compose_nginx.cache-from=type=gha,scope=cached-compose-nginx
@@ -295,12 +299,13 @@ jobs:
         cp .env.example .env
     -
       name: load images
-      uses: docker/bake-action@master
+      uses: docker/bake-action@v6.0.0
       with:
         files: docker-compose.yml,docker-compose.dev.yml
         push: false
         load: true
         workdir: compose
+        source: "{{defaultContext}}:compose"
         set: |
             compose.cache-from=type=gha,scope=cached-compose
             compose_nginx.cache-from=type=gha,scope=cached-compose-nginx
@@ -378,25 +383,27 @@ jobs:
         cp store/.env.example store/.env
     -
       name: load compose images
-      uses: docker/bake-action@master
+      uses: docker/bake-action@v6.0.0
       with:
         files: docker-compose.yml,docker-compose.dev.yml
         push: false
         load: true
         workdir: compose
+        source: "{{defaultContext}}:compose"
         set: |
             compose.cache-from=type=gha,scope=cached-compose
             compose_nginx.cache-from=type=gha,scope=cached-compose-nginx
             compose_pgsql.cache-from=type=gha,scope=cached-compose-pgsql
             compose_worker.cache-from=type=gha,scope=cached-compose-worker
     -
       name: load store images
-      uses: docker/bake-action@master
+      uses: docker/bake-action@v6.0.0
       with:
         files: docker-compose.yml,docker-compose.dev.yml
         push: false
         load: true
         workdir: store
+        source: "{{defaultContext}}:store"
         set: |
             neurostore.cache-from=type=gha,scope=cached-neurostore
             store_nginx.cache-from=type=gha,scope=cached-store-nginx

diff --git a/store/neurostore/requirements.txt b/store/neurostore/requirements.txt
@@ -29,7 +29,7 @@ wrapt~=1.12
 openapi-spec-validator~=0.3
 scipy~=1.9
 pytest~=7.1
-vcrpy~=6.0
+vcrpy~=7.0
 pytest-recording~=0.13.1
 orjson~=3.8
 flask_orjson~=2.0.0