From b0eff8ae7525f690b4b40a2d2ca3e85395cb7095 Mon Sep 17 00:00:00 2001 From: Olivier Cervello Date: Thu, 25 Nov 2021 10:39:36 +0100 Subject: [PATCH 1/4] Update docker-compose.yml --- docker-compose.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3f08fbb..e33dc7d 100644 --- 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: From 5034dd244c16c38780c5754cf699e57c741348eb Mon Sep 17 00:00:00 2001 From: Olivier Cervello Date: Thu, 25 Nov 2021 10:40:02 +0100 Subject: [PATCH 2/4] Update Makefile --- Makefile | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Makefile b/Makefile index e1ab8a6..a386830 100644 --- 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 # #---------# From 46692704b9ae0835efc2bd06f8971f7f9970807a Mon Sep 17 00:00:00 2001 From: Olivier Cervello Date: Thu, 25 Nov 2021 10:40:17 +0100 Subject: [PATCH 3/4] Update prod.yml --- docker/prod.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/docker/prod.yml b/docker/prod.yml index d01511e..2fe3bed 100644 --- a/docker/prod.yml +++ b/docker/prod.yml @@ -1,5 +1 @@ version: "3.9" - -volumes: - ann_data: - external: true From 85c11320596a3a7f5d5effcaad4f49941f1b899a Mon Sep 17 00:00:00 2001 From: Olivier Cervello Date: Thu, 25 Nov 2021 10:40:49 +0100 Subject: [PATCH 4/4] Update container-deploy.yml --- .github/workflows/container-deploy.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/container-deploy.yml b/.github/workflows/container-deploy.yml index 9a54f08..06c1d6b 100644 --- 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: