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
4 changes: 2 additions & 2 deletions src/.env
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ DOMAIN=localhost
STACK_NAME=full-stack-fastapi-postgresql

TRAEFIK_PUBLIC_NETWORK=traefik-public
TRAEFIK_TAG=
TRAEFIK_TAG=traefik
TRAEFIK_PUBLIC_TAG=traefik-public

# Configure these with your own Docker registry images
Expand All @@ -16,7 +16,7 @@ DOCKER_IMAGE_FRONTEND=frontend

# Backend
BACKEND_CORS_ORIGINS="[\"http://localhost\", \"http://localhost:4200\", \"http://localhost:3000\", \"http://localhost:8080\", \"https://localhost\", \"https://localhost:4200\", \"https://localhost:3000\", \"https://localhost:8080\", \"http://local.dockertoolbox.tiangolo.com\", \"http://localhost.tiangolo.com\"]"
PROJECT_NAME=
PROJECT_NAME="Full Stack FastAPI PostgreSQL"
SECRET_KEY=changethis
[email protected]
FIRST_SUPERUSER_PASSWORD=changethis
Expand Down
6 changes: 4 additions & 2 deletions src/frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Stage 0, "build-stage", based on Node.js, to build and compile the frontend
FROM tiangolo/node-frontend:10 as build-stage
FROM node:18.12.1 as build-stage

WORKDIR /app

Expand All @@ -13,6 +13,8 @@ ARG FRONTEND_ENV=production

ENV VUE_APP_ENV=${FRONTEND_ENV}

ENV NODE_OPTIONS="--openssl-legacy-provider"

# Comment out the next line to disable tests
RUN npm run test:unit

Expand All @@ -24,5 +26,5 @@ FROM nginx:1.15

COPY --from=build-stage /app/dist/ /usr/share/nginx/html

COPY --from=build-stage /nginx.conf /etc/nginx/conf.d/default.conf
COPY ./nginx.conf /etc/nginx/conf.d/default.conf
COPY ./nginx-backend-not-found.conf /etc/nginx/extra-conf.d/backend-not-found.conf
11 changes: 11 additions & 0 deletions src/frontend/nginx.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
server {
listen 80;

location / {
root /usr/share/nginx/html;
index index.html index.htm;
try_files $uri $uri/ /index.html =404;
}

include /etc/nginx/extra-conf.d/*.conf;
}