From 94dab49fba9fb131f6aa04cc8b5f84ae62ffd730 Mon Sep 17 00:00:00 2001 From: StepanovPlaton Date: Tue, 3 Feb 2026 02:01:30 +0400 Subject: [PATCH] deploy --- .env | 4 ++-- Dockerfile | 21 +++++++++++---------- nginx.conf | 2 +- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.env b/.env index d6bcd8c..76ea9d4 100644 --- a/.env +++ b/.env @@ -1,6 +1,6 @@ # GitHub OAuth -OAUTH_GITHUB_CLIENT_ID= -OAUTH_GITHUB_CLIENT_SECRET= +#OAUTH_GITHUB_CLIENT_ID= +#OAUTH_GITHUB_CLIENT_SECRET= # Decap CMS PUBLIC_DECAP_CMS_SRC_URL=https://unpkg.com/decap-cms@^3.3.3/dist/decap-cms.js diff --git a/Dockerfile b/Dockerfile index a0013b4..9ce0cdf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,21 +1,22 @@ # Stage 1: Build FROM node:22-alpine AS builder -# Install dependencies for sharp and other native modules -RUN apk add --no-cache \ - python3 \ - make \ - g++ \ - libc6-compat - # Set working directory WORKDIR /app +# Accept build arguments +ARG OAUTH_GITHUB_CLIENT_ID +ARG OAUTH_GITHUB_CLIENT_SECRET + +# Set environment variables from build args +ENV OAUTH_GITHUB_CLIENT_ID=${OAUTH_GITHUB_CLIENT_ID} +ENV OAUTH_GITHUB_CLIENT_SECRET=${OAUTH_GITHUB_CLIENT_SECRET} + # Copy package files COPY package.json package-lock.json* ./ # Install dependencies -RUN npm ci --only=production=false +RUN npm ci # Copy source code COPY . . @@ -32,8 +33,8 @@ COPY --from=builder /app/dist /usr/share/nginx/html # Copy nginx configuration COPY nginx.conf /etc/nginx/conf.d/default.conf -# Expose port 80 -EXPOSE 80 +# Expose port 8091 (for rootless podman) +EXPOSE 8091 # Start nginx CMD ["nginx", "-g", "daemon off;"] diff --git a/nginx.conf b/nginx.conf index 457d139..64520d6 100644 --- a/nginx.conf +++ b/nginx.conf @@ -1,5 +1,5 @@ server { - listen 80; + listen 8091; server_name localhost; root /usr/share/nginx/html; index index.html;