Merge pull request #70 from LibreCodeCoop/fix/build-nginx

fix: build nginx
LibreCodeCoop · Jul 16, 2024 · 9c95a7d · 9c95a7d
2 parents 7581f1b + e8f0364
commit 9c95a7d
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/.docker/Dockerfile.nginx b/.docker/Dockerfile.nginx
@@ -0,0 +1,3 @@
+FROM nginx:alpine
+
+COPY nginx/nginx.conf /etc/nginx/nginx.conf
diff --git a/.docker/web/nginx.conf → .docker/nginx/nginx.conf b/.docker/web/nginx.conf → .docker/nginx/nginx.conf
diff --git a/.docker/web/Dockerfile b/.docker/web/Dockerfile
diff --git 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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		FROM nginx:alpine

		COPY nginx/nginx.conf /etc/nginx/nginx.conf