From c0e8520d31a3eb80e981c57966a0c2b9af1b67fd Mon Sep 17 00:00:00 2001
From: Dmitry Verkhoturov <paskal.07@gmail.com>
Date: Thu, 15 Sep 2022 09:26:46 +0200
Subject: [PATCH] fix makefile and dockerfile

Here are multiple changes to commands run by Makefile based on my
attempts to run it on an Oracle Linux machine with the latest Docker.
---
 .github/workflows/e2e-tests.yml          | 2 +-
 Dockerfile.artifacts                     | 2 +-
 Makefile                                 | 2 +-
 site/src/docs/manuals/subdomain/index.md | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index 4a43bd66..a58530e9 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -24,7 +24,7 @@ jobs:
 
       - name: Build & run containers
         id: tests
-        run: COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker-compose -f compose-e2e-test.yml up --build --quiet-pull --exit-code-from tests
+        run: COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker compose -f compose-e2e-test.yml up --build --quiet-pull --exit-code-from tests
 
       - uses: actions/upload-artifact@v2
         if: always()
diff --git a/Dockerfile.artifacts b/Dockerfile.artifacts
index 39321dd1..141c31b1 100644
--- a/Dockerfile.artifacts
+++ b/Dockerfile.artifacts
@@ -4,7 +4,7 @@ ENV CI=true
 
 WORKDIR /srv/frontend
 
-COPY ./frontend/package.json ./frontend/pnpm-lock.yaml ./frontend/pnpm-workspace.yaml /srv/frontend
+COPY ./frontend/package.json ./frontend/pnpm-lock.yaml ./frontend/pnpm-workspace.yaml /srv/frontend/
 COPY ./frontend/apps/remark42/package.json /srv/frontend/apps/remark42/package.json
 
 RUN apk add --no-cache --update git && npm i -g pnpm
diff --git a/Makefile b/Makefile
index 4680a611..516f7ebf 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ bin:
 	docker rm -f remark42.bin
 
 docker:
-	docker build -t umputun/remark42 --build-arg GITHUB_REF=$(GITHUB_REF) --build-arg GITHUB_SHA=$(GITHUB_SHA) \
+	DOCKER_BUILDKIT=1 docker build -t umputun/remark42 --build-arg GITHUB_REF=$(GITHUB_REF) --build-arg GITHUB_SHA=$(GITHUB_SHA) \
 		--build-arg CI=true --build-arg SKIP_FRONTEND_TEST=true --build-arg SKIP_BACKEND_TEST=true .
 
 dockerx:
diff --git a/site/src/docs/manuals/subdomain/index.md b/site/src/docs/manuals/subdomain/index.md
index fabfbe13..d51bb165 100644
--- a/site/src/docs/manuals/subdomain/index.md
+++ b/site/src/docs/manuals/subdomain/index.md
@@ -19,7 +19,7 @@ All README examples show configurations with remark42 on its own subdomain, i.e.
 
 Both Nginx and Caddy configuration below rely on remark42 available on hostname `remark42`, which is achieved by having `container_name: remark42` in docker-compose.
 
-Example `docker-compose.yaml`:
+Example `docker-compose.yml`:
 
 ```yaml
 version: "2"