From 71aee1fd4c6bcff323a3d0acbcea9dc1eca852aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Horv=C3=A1th=20Istv=C3=A1n?= Date: Sat, 30 May 2026 16:21:56 +0200 Subject: [PATCH 1/2] Fix package manager --- frontend/.env.docker | 17 ++++++++++++ frontend/.env.example | 1 - frontend/Dockerfile | 9 ++++--- frontend/entrypoint.sh | 12 +++++++++ frontend/index.html | 22 ++++++++++++++- frontend/package.json | 2 +- .../api/hooks/riddle/useRiddleDeatilsQuery.ts | 3 +-- .../api/hooks/riddle/useRiddleHintQuery.ts | 3 +-- .../api/hooks/riddle/useRiddleHistoryQuery.ts | 3 +-- .../api/hooks/riddle/useRiddleListQuery.ts | 3 +-- .../api/hooks/riddle/useRiddleSkipMutation.ts | 3 +-- .../hooks/riddle/useRiddleSubmitMutation.ts | 3 +-- frontend/src/global.d.ts | 25 +++++++++++++++++ .../src/util/configs/environment.config.ts | 27 +++++++++---------- frontend/src/vite-env.d.ts | 23 ---------------- frontend/tsconfig.app.json | 1 - 16 files changed, 101 insertions(+), 56 deletions(-) create mode 100644 frontend/.env.docker create mode 100644 frontend/entrypoint.sh create mode 100644 frontend/src/global.d.ts diff --git a/frontend/.env.docker b/frontend/.env.docker new file mode 100644 index 000000000..ab0356a55 --- /dev/null +++ b/frontend/.env.docker @@ -0,0 +1,17 @@ +VITE_API_BASE_URL=__VITE_API_BASE_URL__ +VITE_DISABLE_APP_CONFIG_CACHE=__VITE_DISABLE_APP_CONFIG_CACHE__ +VITE_APP_CONFIG_CACHE_TTL_SECONDS=__VITE_APP_CONFIG_CACHE_TTL_SECONDS__ +VITE_HIDE_KIR_DEV_IN_FOOTER=__VITE_HIDE_KIR_DEV_IN_FOOTER__ +VITE_CLIENT_BASE_URL=__VITE_CLIENT_BASE_URL__ +VITE_OFFICIAL_LANGUAGE=__VITE_OFFICIAL_LANGUAGE__ +VITE_PASS_SERVER_URL=__VITE_PASS_SERVER_URL__ +VITE_PASS_TEMPLATE=__VITE_PASS_TEMPLATE__ +VITE_FIREBASE_PROJECT_ID=__VITE_FIREBASE_PROJECT_ID__ +VITE_FIREBASE_APP_ID=__VITE_FIREBASE_APP_ID__ +VITE_FIREBASE_API_KEY=__VITE_FIREBASE_API_KEY__ +VITE_FIREBASE_SENDER_ID=__VITE_FIREBASE_SENDER_ID__ +VITE_FIREBASE_WEB_PUSH_PUBLIC_KEY=__VITE_FIREBASE_WEB_PUSH_PUBLIC_KEY__ +VITE_NAME=__VITE_NAME__ +VITE_DESCRIPTION=__VITE_DESCRIPTION__ +VITE_THEME_COLOR=__VITE_THEME_COLOR__ +VITE_PLAUSIBLE_URL=__VITE_PLAUSIBLE_URL__ diff --git a/frontend/.env.example b/frontend/.env.example index d977c4214..cefd2ff5e 100644 --- a/frontend/.env.example +++ b/frontend/.env.example @@ -8,7 +8,6 @@ VITE_PASS_SERVER_URL=https://pass.kir-dev.hu VITE_PASS_TEMPLATE=generic VITE_THEME_COLOR="#ffffff" VITE_OFFICIAL_LANGUAGE=false -VITE_NEW_RIDDLE_ENDPOINTS=true VITE_FIREBASE_PROJECT_ID="Set if you need push notifications" VITE_FIREBASE_API_KEY="Set if you need push notifications" VITE_FIREBASE_SENDER_ID="Set if you need push notifications" diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 0029dad41..f3392ab02 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -5,13 +5,14 @@ FROM docker.io/node:24-alpine AS build WORKDIR /app # Copy package.json and package.lock (or package-lock.json) to the working directory -COPY package.json package.lock ./ +COPY package.json package-lock.json ./ # Install dependencies RUN npm ci # Copy the rest of the application code to the working directory COPY . . +COPY .env.docker .env # Build the application RUN npm run build @@ -23,9 +24,11 @@ FROM docker.io/nginx:alpine COPY --from=build /app/dist /usr/share/nginx/html COPY nginx.conf /etc/nginx/conf.d/default.conf +COPY entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh # Expose the desired port (default is 80 for Nginx) EXPOSE 80 -# Set the command to start the Nginx server -CMD ["nginx", "-g", "daemon off;"] +# Set the entrypoint to inject runtime env vars then start Nginx +ENTRYPOINT ["/entrypoint.sh"] diff --git a/frontend/entrypoint.sh b/frontend/entrypoint.sh new file mode 100644 index 000000000..f93974d76 --- /dev/null +++ b/frontend/entrypoint.sh @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +HTML=/usr/share/nginx/html/index.html + +for var in $(env | grep '^VITE_' | cut -d= -f1); do + placeholder="__${var}__" + value=$(printenv "$var" | sed 's/[&/\]/\\&/g') + sed -i "s|${placeholder}|${value}|g" "$HTML" +done + +exec nginx -g "daemon off;" diff --git a/frontend/index.html b/frontend/index.html index 476ebc794..e675fcc70 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -29,6 +29,25 @@ } + +