Skip to content

Commit 70d7205

Browse files
Merge pull request #14 from stefanbobrowski/feature/mvp
This is it. It has to be fixed now
2 parents 7dbf7f6 + 83f5b92 commit 70d7205

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

.github/workflows/google-cloudrun-docker.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,9 @@ jobs:
3939
- name: Build and Push Docker image
4040
run: |
4141
IMAGE="${{ env.REGION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.REPOSITORY }}/${{ env.SERVICE }}:${{ github.sha }}"
42-
docker build -t $IMAGE .
42+
docker build \
43+
--build-arg VITE_RECAPTCHA_SITE_KEY=${{ secrets.VITE_RECAPTCHA_SITE_KEY }} \
44+
-t $IMAGE .
4345
docker push $IMAGE
4446
4547
- name: Deploy to Cloud Run

Dockerfile

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
1-
2-
31
# Stage 1: Build frontend
42
FROM node:20-alpine AS build-frontend
53
WORKDIR /app/frontend
4+
5+
# Accept build-time environment variable
6+
ARG VITE_RECAPTCHA_SITE_KEY
7+
ENV VITE_RECAPTCHA_SITE_KEY=$VITE_RECAPTCHA_SITE_KEY
8+
69
COPY frontend/package*.json ./
710
RUN npm install
11+
812
COPY frontend ./
913
COPY frontend/.env.production .env.production
10-
RUN npm run build
1114

12-
# Accept build-time environment variable
13-
ARG VITE_RECAPTCHA_SITE_KEY
14-
ENV VITE_RECAPTCHA_SITE_KEY=$VITE_RECAPTCHA_SITE_KEY
15+
# Ensure Vite sees the environment variable
16+
RUN echo "VITE_RECAPTCHA_SITE_KEY=$VITE_RECAPTCHA_SITE_KEY" >> .env.production
17+
18+
RUN npm run build
1519

1620
# Stage 2: Build backend
1721
FROM node:20-alpine
@@ -22,10 +26,9 @@ COPY backend/package*.json ./backend/
2226
RUN cd backend && npm install --omit=dev
2327
COPY backend ./backend
2428

25-
# Copy built frontend into backend’s public/dist folder (or wherever it expects)
29+
# Copy built frontend into backend’s public/dist folder
2630
COPY --from=build-frontend /app/frontend/dist ./frontend/dist
2731

28-
# Set working dir to backend and start the app
2932
WORKDIR /app/backend
3033
EXPOSE 8080
31-
CMD ["node", "server.js"]
34+
CMD ["node", "server.js"]

0 commit comments

Comments
 (0)