diff --git a/Dockerfile b/Dockerfile index f6fd3ab..2e7606d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -# global variable declaration: -# -Build to serve under Subdirectory BASE_URL if provided, eg: "ARG BASE_URL=/pdf/", otherwise leave blank: "ARG BASE_URL=" +# Global variable declaration: +# Build to serve under Subdirectory BASE_URL if provided, eg: "ARG BASE_URL=/pdf/", otherwise leave blank: "ARG BASE_URL=" ARG BASE_URL= # Build stage @@ -11,7 +11,7 @@ COPY . . # Build without type checking (vite build only) # Pass SIMPLE_MODE environment variable if provided -ARG SIMPLE_MODE=true +ARG SIMPLE_MODE=false ENV SIMPLE_MODE=$SIMPLE_MODE # global arg to local arg @@ -19,9 +19,9 @@ ARG BASE_URL ENV BASE_URL=$BASE_URL RUN if [ -z "$BASE_URL" ]; then \ - npm run build -- --mode production; \ + npm run build -- --mode production; \ else \ - npm run build -- --base=${BASE_URL} --mode production; \ + npm run build -- --base=${BASE_URL} --mode production; \ fi # Production stage @@ -34,65 +34,7 @@ ARG BASE_URL COPY --chown=nginx:nginx --from=builder /app/dist /usr/share/nginx/html${BASE_URL%/} COPY --chown=nginx:nginx nginx.conf /etc/nginx/nginx.conf - -RUN set -e; \ - SUBDIR=$(echo "${BASE_URL}" | sed 's:^/::; s:/$::'); \ - if [ -z "${SUBDIR}" ] || [ "${SUBDIR}" = "/" ]; then \ - DEST_DIR="/usr/share/nginx/html"; \ - else \ - DEST_DIR="/usr/share/nginx/html/${SUBDIR}"; \ - mkdir -p "${DEST_DIR}"; \ - fi; \ - chown -R nginx:nginx /usr/share/nginx/html; \ - echo "Destination directory: ${DEST_DIR}" - -COPY --chown=nginx:nginx --from=builder /app/dist /tmp/dist - -RUN set -e; \ - SUBDIR=$(echo "${BASE_URL}" | sed 's:^/::; s:/$::'); \ - if [ -z "${SUBDIR}" ] || [ "${SUBDIR}" = "/" ]; then \ - DEST_DIR="/usr/share/nginx/html"; \ - else \ - DEST_DIR="/usr/share/nginx/html/${SUBDIR}"; \ - fi; \ - cp -r /tmp/dist/* "${DEST_DIR}/"; \ - rm -rf /tmp/dist; \ - chown -R nginx:nginx /usr/share/nginx/html; \ - echo "Files copied to: ${DEST_DIR}"; \ - ls -la "${DEST_DIR}" | head -20 - RUN mkdir -p /etc/nginx/tmp && chown -R nginx:nginx /etc/nginx/tmp -USER nginx - EXPOSE 8080 CMD ["nginx", "-g", "daemon off;"] - - - -# Old Dockerfile for Root User -# # Build stage -# FROM node:20-alpine AS builder - -# WORKDIR /app - -# COPY package*.json ./ -# RUN npm ci - -# COPY . . - -# # Build without type checking (vite build only) -# # Pass SIMPLE_MODE environment variable if provided -# ARG SIMPLE_MODE=false -# ENV SIMPLE_MODE=$SIMPLE_MODE -# RUN npm run build -- --mode production - -# # Production stage -# FROM nginx:alpine - -# COPY --from=builder /app/dist /usr/share/nginx/html -# COPY nginx.conf /etc/nginx/nginx.conf - -# EXPOSE 8080 - -# CMD ["nginx", "-g", "daemon off;"] diff --git a/README.md b/README.md index e41422b..7a9608b 100644 --- a/README.md +++ b/README.md @@ -326,7 +326,9 @@ docker build \ docker run -p 3000:8080 bentopdf-simple ``` -> **Important**: Always include trailing slashes in `BASE_URL` (e.g., `/bentopdf/` not `/bentopdf`). The default value is `/` for root deployment. +> **Important**: +> - Always include trailing slashes in `BASE_URL` (e.g., `/bentopdf/` not `/bentopdf`) +> - The default value is `/` for root deployment ### 🚀 Run with Docker Compose (Recommended) diff --git a/about.html b/about.html index 58c60c2..a2a68a1 100644 --- a/about.html +++ b/about.html @@ -5,6 +5,10 @@ About Bentopdf - Fast, Private, and Free PDF Tools + + + + @@ -16,10 +20,7 @@