From c83a9c41b5f33bf784c6ecae4614215342c9dfa8 Mon Sep 17 00:00:00 2001 From: Troy Date: Mon, 14 Apr 2025 02:01:02 +0100 Subject: [PATCH 1/2] fix: remove trailing slash --- .forgejo/workflows/docker.yml | 2 +- Dockerfile | 1 + package-lock.json | 14 +++++++------- package.json | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.forgejo/workflows/docker.yml b/.forgejo/workflows/docker.yml index 9292a46..8c5ffcf 100644 --- a/.forgejo/workflows/docker.yml +++ b/.forgejo/workflows/docker.yml @@ -3,7 +3,7 @@ name: Docker on: push: branches: - - "main" + - "remove-trailing-slash" env: REGISTRY: code.troylusty.com diff --git a/Dockerfile b/Dockerfile index 14f5cfe..880d8e9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,3 +10,4 @@ RUN ["npx", "astro", "build"] FROM ghcr.io/static-web-server/static-web-server:latest WORKDIR / COPY --from=node /usr/src/app/dist /public +ENV SERVER_REDIRECT_TRAILING_SLASH false diff --git a/package-lock.json b/package-lock.json index 5fe8a2d..c400cc1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -24,7 +24,7 @@ "devDependencies": { "@iconify-json/mdi": "^1.2.3", "@tailwindcss/typography": "^0.5.16", - "@types/node": "^22.14.0", + "@types/node": "^22.14.1", "npm-check-updates": "^17.1.18", "prettier": "^3.5.3", "prettier-plugin-astro": "^0.14.1", @@ -1945,9 +1945,9 @@ } }, "node_modules/@types/node": { - "version": "22.14.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.0.tgz", - "integrity": "sha512-Kmpl+z84ILoG+3T/zQFyAJsU6EPTmOCj8/2+83fSN6djd6I4o7uOuGIH6vq3PrjY5BGitSbFuMN18j3iknubbA==", + "version": "22.14.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.14.1.tgz", + "integrity": "sha512-u0HuPQwe/dHrItgHHpmw3N2fYCR6x4ivMNbPHRkBVP4CvN+kiRrKHWk3i8tXiO/joPwXLMYvF9TTF0eqgHIuOw==", "license": "MIT", "dependencies": { "undici-types": "~6.21.0" @@ -7654,9 +7654,9 @@ } }, "node_modules/vite": { - "version": "6.2.5", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.5.tgz", - "integrity": "sha512-j023J/hCAa4pRIUH6J9HemwYfjB5llR2Ps0CWeikOtdR8+pAURAk0DoJC5/mm9kd+UgdnIy7d6HE4EAvlYhPhA==", + "version": "6.2.6", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.2.6.tgz", + "integrity": "sha512-9xpjNl3kR4rVDZgPNdTL0/c6ao4km69a/2ihNQbcANz8RuCOK3hQBmLSJf3bRKVQjVMda+YvizNE8AwvogcPbw==", "license": "MIT", "dependencies": { "esbuild": "^0.25.0", diff --git a/package.json b/package.json index 87fff70..2745a26 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "devDependencies": { "@iconify-json/mdi": "^1.2.3", "@tailwindcss/typography": "^0.5.16", - "@types/node": "^22.14.0", + "@types/node": "^22.14.1", "npm-check-updates": "^17.1.18", "prettier": "^3.5.3", "prettier-plugin-astro": "^0.14.1", -- 2.45.3 From 7d51cd186f534818f70843a564ff35ac549c3bd7 Mon Sep 17 00:00:00 2001 From: Troy Date: Mon, 14 Apr 2025 02:10:16 +0100 Subject: [PATCH 2/2] fix: correct dockerfile env syntax --- .forgejo/workflows/docker.yml | 2 +- Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/docker.yml b/.forgejo/workflows/docker.yml index 8c5ffcf..9292a46 100644 --- a/.forgejo/workflows/docker.yml +++ b/.forgejo/workflows/docker.yml @@ -3,7 +3,7 @@ name: Docker on: push: branches: - - "remove-trailing-slash" + - "main" env: REGISTRY: code.troylusty.com diff --git a/Dockerfile b/Dockerfile index 880d8e9..c474d59 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:latest as node +FROM node:latest AS node USER node WORKDIR /usr/src/app @@ -10,4 +10,4 @@ RUN ["npx", "astro", "build"] FROM ghcr.io/static-web-server/static-web-server:latest WORKDIR / COPY --from=node /usr/src/app/dist /public -ENV SERVER_REDIRECT_TRAILING_SLASH false +ENV SERVER_REDIRECT_TRAILING_SLASH=false -- 2.45.3