From e8f0364d1852e1f3ca5412363b1546c333b3c349 Mon Sep 17 00:00:00 2001
From: Vitor Mattos <vitor@php.rio>
Date: Mon, 15 Jul 2024 23:41:55 -0300
Subject: [PATCH] fix: build nginx

Signed-off-by: Vitor Mattos <vitor@php.rio>
---
 .docker/Dockerfile.nginx           | 3 +++
 .docker/{web => nginx}/nginx.conf  | 0
 .docker/web/Dockerfile             | 3 ---
 .github/workflows/docker-nginx.yml | 3 +--
 docker-compose.yml                 | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100644 .docker/Dockerfile.nginx
 rename .docker/{web => nginx}/nginx.conf (100%)
 delete mode 100644 .docker/web/Dockerfile

diff --git a/.docker/Dockerfile.nginx b/.docker/Dockerfile.nginx
new file mode 100644
index 0000000..16181bb
--- /dev/null
+++ b/.docker/Dockerfile.nginx
@@ -0,0 +1,3 @@
+FROM nginx:alpine
+
+COPY nginx/nginx.conf /etc/nginx/nginx.conf
\ No newline at end of file
diff --git a/.docker/web/nginx.conf b/.docker/nginx/nginx.conf
similarity index 100%
rename from .docker/web/nginx.conf
rename to .docker/nginx/nginx.conf
diff --git a/.docker/web/Dockerfile b/.docker/web/Dockerfile
deleted file mode 100644
index 9ded20d..0000000
--- a/.docker/web/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM nginx:alpine
-
-COPY nginx.conf /etc/nginx/nginx.conf
\ No newline at end of file
diff --git a/.github/workflows/docker-nginx.yml b/.github/workflows/docker-nginx.yml
index d26dff3..ff98f00 100644
--- a/.github/workflows/docker-nginx.yml
+++ b/.github/workflows/docker-nginx.yml
@@ -44,8 +44,7 @@ jobs:
       - name: Set dockerfile path
         id: dockerfile
         run: |
-          NAME="web"
-          DOCKERFILE=$([[ -f ".docker/$NAME/Dockerfile" ]] && echo ".docker/$NAME/Dockerfile" || echo ".docker/Dockerfile.$NAME")
+          DOCKERFILE=$(echo ".docker/Dockerfile.nginx")
           echo "DOCKERFILE=$DOCKERFILE" >> $GITHUB_OUTPUT
       - name: Build container image
         uses: docker/build-push-action@v5
diff --git a/docker-compose.yml b/docker-compose.yml
index 196eeff..71c29ce 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -64,7 +64,7 @@ services:
       - host.docker.internal:host-gateway
   nginx:
     image: ghcr.io/librecodecoop/nextcloud-dev-nginx:latest
-    # build: .docker/web
+    # build: .docker/nginx
     restart: unless-stopped
     volumes:
       - ./volumes/nextcloud:/var/www/html:ro