From 993edd9c283a8ccf6ad845e2a5933b84e4d2c856 Mon Sep 17 00:00:00 2001
From: CyanoFresh <cyanofresh@gmail.com>
Date: Tue, 17 Aug 2021 01:52:37 +0300
Subject: [PATCH] fixes

---
 .dockerignore                    |  1 +
 .github/workflows/cached.yml     | 10 +++++-----
 .github/workflows/not-cached.yml | 10 +++++-----
 app1/.dockerignore               |  1 -
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 63ac784..cfb888f 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,3 @@
 .git
 .idea
+README.md
diff --git a/.github/workflows/cached.yml b/.github/workflows/cached.yml
index 1ce8a3d..dc101c6 100644
--- a/.github/workflows/cached.yml
+++ b/.github/workflows/cached.yml
@@ -7,8 +7,8 @@ on:
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
-#  DOCKER_BUILDKIT: 1
-#  COMPOSE_DOCKER_CLI_BUILD: 1
+  DOCKER_BUILDKIT: 1
+  COMPOSE_DOCKER_CLI_BUILD: 1
 
 jobs:
   build:
@@ -22,8 +22,8 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-#      - name: Set up Docker Buildx
-#        uses: docker/setup-buildx-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
 
       - name: Login to GitHub Container Registry
         if: github.event_name != 'pull_request'
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build the stack
-        run: docker-compose build
+        run: docker-compose build --build-arg BUILDKIT_INLINE_CACHE=1
 
       - name: Push the stack
         run: docker-compose push
diff --git a/.github/workflows/not-cached.yml b/.github/workflows/not-cached.yml
index ba094d5..f2e3a6e 100644
--- a/.github/workflows/not-cached.yml
+++ b/.github/workflows/not-cached.yml
@@ -7,8 +7,8 @@ on:
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
-  DOCKER_BUILDKIT: 1
-  COMPOSE_DOCKER_CLI_BUILD: 1
+#  DOCKER_BUILDKIT: 1
+#  COMPOSE_DOCKER_CLI_BUILD: 1
 
 jobs:
   build:
@@ -22,8 +22,8 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v2
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+#      - name: Set up Docker Buildx
+#        uses: docker/setup-buildx-action@v1
 
       - name: Login to GitHub Container Registry
         if: github.event_name != 'pull_request'
@@ -34,7 +34,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build the stack
-        run: docker-compose build --build-arg BUILDKIT_INLINE_CACHE=1
+        run: docker-compose build
 
       - name: Push the stack
         run: docker-compose push
diff --git a/app1/.dockerignore b/app1/.dockerignore
index 47dfb72..3c3629e 100644
--- a/app1/.dockerignore
+++ b/app1/.dockerignore
@@ -1,2 +1 @@
 node_modules
-cache