убрал лишнее.

sergey-xx · Nov 9, 2023 · 76bfa02 · 76bfa02
1 parent bdeece2
commit 76bfa02
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 10,560 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -62,25 +62,25 @@ jobs:
           push: true
           tags: ${{ secrets.DOCKER_USERNAME }}/foodgram_backend:latest
 
-  build_frontend_and_push_to_docker_hub:
-    name: Push frontend Docker image to DockerHub
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out the repo
-        uses: actions/checkout@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      - name: Login to Docker 
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Push to DockerHub
-        uses: docker/build-push-action@v4
-        with:
-          context: ./frontend/
-          push: true
-          tags: ${{ secrets.DOCKER_USERNAME }}/foodgram_frontend:latest
+  # build_frontend_and_push_to_docker_hub:
+  #   name: Push frontend Docker image to DockerHub
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Check out the repo
+  #       uses: actions/checkout@v3
+  #     - name: Set up Docker Buildx
+  #       uses: docker/setup-buildx-action@v2
+  #     - name: Login to Docker 
+  #       uses: docker/login-action@v2
+  #       with:
+  #         username: ${{ secrets.DOCKER_USERNAME }}
+  #         password: ${{ secrets.DOCKER_PASSWORD }}
+  #     - name: Push to DockerHub
+  #       uses: docker/build-push-action@v4
+  #       with:
+  #         context: ./frontend/
+  #         push: true
+  #         tags: ${{ secrets.DOCKER_USERNAME }}/foodgram_frontend:latest
 
   build_gateway_and_push_to_docker_hub:
     name: Push gateway Docker image to DockerHub
@@ -106,7 +106,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: 
       - build_and_push_to_docker_hub
-      - build_frontend_and_push_to_docker_hub
+      # - build_frontend_and_push_to_docker_hub
       - build_gateway_and_push_to_docker_hub
     steps:
     - name: Checkout repo

diff --git a/.gitignore b/.gitignore
@@ -60,6 +60,8 @@ coverage.xml
 local_settings.py
 db.sqlite3
 db.sqlite3-journal
+db*.sqlite3
+db.json
 
 # Flask stuff:
 instance/
@@ -160,4 +162,7 @@ yarn-debug.log*
 yarn-error.log*
 
 # static
-static/
+static/
+
+# frontend
+frontend/
diff --git a/backend/.dockerignore b/backend/.dockerignore
@@ -1,4 +1,5 @@
 venv
 .git
 db.sqlite3
-.env
+.env
+db copy.sqlite3
diff --git a/backend/db.json b/backend/db.json
diff --git a/backend/mydata.json b/backend/mydata.json