Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,9 @@ jobs:
platforms: linux/amd64
file: frontend-nextjs/Dockerfile
push: true
build-args: |
NEXT_PUBLIC_APP_URL=${{ vars.NEXT_PUBLIC_APP_URL }}
NEXT_PUBLIC_API_BASE_URL=${{ vars.NEXT_PUBLIC_API_BASE_URL }}
tags: |
ghcr.io/devsoc-unsw/${{ env.IMAGE_NAME }}-frontend:${{ github.sha }}
ghcr.io/devsoc-unsw/${{ env.IMAGE_NAME }}-frontend:latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/frontend-nextjs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ jobs:
env:
NEXT_PUBLIC_APP_URL: http://localhost:3000
NEXT_OAUTH_CALLBACK_URL: http://localhost:8080/auth/google
NEXT_API_BASE_URL: https://localhost:8080
NEXT_PUBLIC_API_BASE_URL: https://localhost:8080
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ services:
env_file:
- ./frontend-nextjs/.env
environment:
NEXT_API_BASE_URL: ${NEXT_API_BASE_URL:-http://backend:8080}
NEXT_PUBLIC_API_BASE_URL: ${NEXT_PUBLIC_API_BASE_URL:-http://backend:8080}
NODE_ENV: production
ports:
- "${FRONTEND_PORT:-3000}:3000"
Expand Down
6 changes: 6 additions & 0 deletions frontend-nextjs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,12 @@ RUN bun add lightningcss-linux-arm64-gnu@1.30.2
RUN bun add @tailwindcss/oxide-linux-arm64-gnu@4.1.18

COPY . .

ARG NEXT_PUBLIC_APP_ROOT_URL
ENV NEXT_PUBLIC_APP_URL=$NEXT_PUBLIC_APP_URL
ARG NEXT_PUBLIC_API_BASE_URL
ENV NEXT_PUBLIC_API_BASE_URL=$NEXT_PUBLIC_API_BASE_URL

RUN bun run build

# runner
Expand Down

This file was deleted.

Loading