From 95a23eb963b489c611793c4410dcb7adee0b9120 Mon Sep 17 00:00:00 2001 From: RedrockJS Date: Wed, 2 Jul 2025 10:44:09 +0300 Subject: [PATCH] fix: upd-2 update cd-cd workflow and dockerfile --- .github/workflows/main.yaml | 6 ++++++ Dockerfile | 21 ++++++++++++++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 87651b4..98a53ce 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -36,6 +36,12 @@ jobs: with: push: true tags: smallbuster/fire-exam:latest + build-args: | + NEXT_PUBLIC_MAIL_USER=${{ secrets.NEXT_PUBLIC_MAIL_USER }} + NEXT_PUBLIC_MAIL_PASS=${{ secrets.NEXT_PUBLIC_MAIL_PASS }} + NEXT_PUBLIC_MAIL_FROM=${{ secrets.NEXT_PUBLIC_MAIL_FROM }} + NEXT_PUBLIC_MAIL_TO=${{ secrets.NEXT_PUBLIC_MAIL_TO }} + NEXT_PUBLIC_MAIL_SECURE_KEY=${{ secrets.NEXT_PUBLIC_MAIL_SECURE_KEY }} - name: Notify Telegram about success if: success() diff --git a/Dockerfile b/Dockerfile index d9242e6..d6bb68f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,19 @@ RUN npm install --frozen-lockfile # Копируем все файлы проекта COPY . . +# Аргумент сборки для переменной окружения +ARG NEXT_PUBLIC_MAIL_USER +ARG NEXT_PUBLIC_MAIL_PASS +ARG NEXT_PUBLIC_MAIL_FROM +ARG NEXT_PUBLIC_MAIL_TO +ARG NEXT_PUBLIC_MAIL_SECURE_KEY + +ENV NEXT_PUBLIC_MAIL_USER=$NEXT_PUBLIC_MAIL_USER \ + NEXT_PUBLIC_MAIL_PASS=$NEXT_PUBLIC_MAIL_PASS \ + NEXT_PUBLIC_MAIL_FROM=$NEXT_PUBLIC_MAIL_FROM \ + NEXT_PUBLIC_MAIL_TO=$NEXT_PUBLIC_MAIL_TO \ + NEXT_PUBLIC_MAIL_SECURE_KEY=$NEXT_PUBLIC_MAIL_SECURE_KEY + # Собираем приложение RUN npm run build @@ -21,7 +34,13 @@ FROM node:22-alpine AS runner WORKDIR /app ENV NODE_ENV=production \ - NEXT_TELEMETRY_DISABLED=1 + NEXT_TELEMETRY_DISABLED=1 \ + NEXT_PUBLIC_MAIL_USER=$NEXT_PUBLIC_MAIL_USER \ + NEXT_PUBLIC_MAIL_PASS=$NEXT_PUBLIC_MAIL_PASS \ + NEXT_PUBLIC_MAIL_FROM=$NEXT_PUBLIC_MAIL_FROM \ + NEXT_PUBLIC_MAIL_TO=$NEXT_PUBLIC_MAIL_TO \ + NEXT_PUBLIC_MAIL_SECURE_KEY=$NEXT_PUBLIC_MAIL_SECURE_KEY + # Включаем node пользователя RUN addgroup -g 1001 -S nodejs