fix: external ann_data volume should be bind-mounted

openfoodfacts · Nov 25, 2021 · da7d123 · da7d123
2 parents 58bdcfc + 85c1132
commit da7d123
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 29 deletions.
diff --git a/.github/workflows/container-deploy.yml b/.github/workflows/container-deploy.yml
@@ -83,20 +83,6 @@ jobs:
           echo "ANN_INSTANCE=${{ startsWith(github.ref, 'refs/tags/v') && 'prod' || 'dev' }}" >> .env
           echo "SENTRY_DSN=${{ secrets.SENTRY_DSN }}" >> .env
 
-    - name: Create Docker volumes
-      uses: appleboy/ssh-action@master
-      with:
-        host: ${{ secrets.HOST }}
-        username: ${{ secrets.USERNAME }}
-        key: ${{ secrets.SSH_PRIVATE_KEY }}
-        proxy_host: ${{ secrets.PROXY_HOST }}
-        proxy_username: ${{ secrets.USERNAME }}
-        proxy_key: ${{ secrets.SSH_PRIVATE_KEY }}
-        script_stop: false
-        script: |
-          cd ${{ matrix.env }}
-          make create_external_volumes
-
     - name: Start services
       uses: appleboy/ssh-action@master
       env:

diff --git a/Makefile b/Makefile
@@ -85,14 +85,6 @@ tests: up_tests _tests down_tests
 
 quality: up_tests _lint _checks _tests down_tests
 
-
-#------------#
-# Production #
-#------------#
-create_external_volumes:
-	@echo "🥫 Creating external volumes (production only) …"
-	docker volume create ann_data
-
 #---------#
 # Cleanup #
 #---------#

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,8 +7,6 @@ services:
     ports:
       - 5501:5501
     volumes:
-      - ann_data:/opt/ann/data
+      - ./ann_data:/opt/ann/data
     environment:
       - SENTRY_DSN
-volumes:
-  ann_data:
diff --git a/docker/prod.yml b/docker/prod.yml
@@ -1,5 +1 @@
 version: "3.9"
-
-volumes:
-  ann_data:
-    external: true