From 60d2e75803e6c1b0a8997a8da60393cf7ec10a33 Mon Sep 17 00:00:00 2001
From: Volodymyr Kolesnykov <volodymyr.kolesnykov@automattic.com>
Date: Mon, 30 Oct 2023 19:02:31 +0200
Subject: [PATCH] ci: allow for building images from Dockerfile directory
 (#564)

---
 .github/workflows/alpine.yml     | 2 +-
 .github/workflows/dev-tools.yml  | 1 -
 .github/workflows/mu-plugins.yml | 1 -
 .github/workflows/nginx.yml      | 2 +-
 .github/workflows/skeleton.yml   | 2 +-
 .github/workflows/traefik.yml    | 2 +-
 nginx/Dockerfile                 | 2 +-
 7 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/alpine.yml b/.github/workflows/alpine.yml
index 8f916026..dc8efc8a 100644
--- a/.github/workflows/alpine.yml
+++ b/.github/workflows/alpine.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Build container image
         uses: docker/build-push-action@v5
         with:
-          file: alpine/Dockerfile
+          context: alpine
           platforms: linux/amd64,linux/arm64
           push: ${{ github.base_ref == null }}
           cache-from: type=gha,scope=alpine
diff --git a/.github/workflows/dev-tools.yml b/.github/workflows/dev-tools.yml
index 00bc3eb9..c63f38be 100644
--- a/.github/workflows/dev-tools.yml
+++ b/.github/workflows/dev-tools.yml
@@ -47,7 +47,6 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: dev-tools
-          file: dev-tools/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: ${{ github.base_ref == null }}
           cache-from: type=gha,scope=dev-tools
diff --git a/.github/workflows/mu-plugins.yml b/.github/workflows/mu-plugins.yml
index fcf3490a..6624aecd 100644
--- a/.github/workflows/mu-plugins.yml
+++ b/.github/workflows/mu-plugins.yml
@@ -52,7 +52,6 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: mu-plugins
-          file: mu-plugins/Dockerfile
           platforms: linux/amd64,linux/arm64
           push: ${{ github.base_ref == null }}
           tags: |
diff --git a/.github/workflows/nginx.yml b/.github/workflows/nginx.yml
index cb6786f5..5c52ea57 100644
--- a/.github/workflows/nginx.yml
+++ b/.github/workflows/nginx.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Build container image
         uses: docker/build-push-action@v5
         with:
-          file: nginx/Dockerfile
+          context: nginx
           platforms: linux/amd64,linux/arm64
           cache-from: type=gha,scope=nginx
           cache-to: type=gha,mode=max,scope=nginx
diff --git a/.github/workflows/skeleton.yml b/.github/workflows/skeleton.yml
index 35ff142c..90be73f4 100644
--- a/.github/workflows/skeleton.yml
+++ b/.github/workflows/skeleton.yml
@@ -47,7 +47,7 @@ jobs:
       - name: Build container image
         uses: docker/build-push-action@v5
         with:
-          file: skeleton/Dockerfile
+          context: skeleton
           platforms: linux/amd64,linux/arm64
           push: ${{ github.base_ref == null }}
           tags: |
diff --git a/.github/workflows/traefik.yml b/.github/workflows/traefik.yml
index 000855b8..177fb450 100644
--- a/.github/workflows/traefik.yml
+++ b/.github/workflows/traefik.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Build container image
         uses: docker/build-push-action@v5
         with:
-          file: traefik/Dockerfile
+          context: traefik
           platforms: linux/amd64,linux/arm64
           push: ${{ github.base_ref == null }}
           cache-from: type=gha,scope=traefik
diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index 7965d5e6..4b0c544e 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -2,4 +2,4 @@ FROM nginx:1.25.3-alpine@sha256:db353d0f0c479c91bd15e01fc68ed0f33d9c4c52f3415e63
 
 RUN apk add --no-cache shadow
 
-COPY nginx/default.conf /etc/nginx/conf.d/default.conf
+COPY default.conf /etc/nginx/conf.d/default.conf