From 725d25181408cd29c16ff9384f453b772c5fc67f Mon Sep 17 00:00:00 2001 From: Jakub Freisler Date: Fri, 15 Nov 2024 01:15:52 +0100 Subject: [PATCH] chore: fixup docs dockerfile (#3243) --- .vuestorefrontcloud/docs/Dockerfile | 4 +++- .vuestorefrontcloud/router/docker/Dockerfile | 2 +- apps/docs/components/nuxt.config.ts | 6 ++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.vuestorefrontcloud/docs/Dockerfile b/.vuestorefrontcloud/docs/Dockerfile index dcbd3e5d73..d08e67513c 100644 --- a/.vuestorefrontcloud/docs/Dockerfile +++ b/.vuestorefrontcloud/docs/Dockerfile @@ -2,17 +2,19 @@ FROM node:20-alpine AS build WORKDIR /var/www +COPY . . + ARG VITE_DOCS_BASEPATH ARG VITE_DOCS_EXAMPLES_REACT_PATH ARG VITE_DOCS_EXAMPLES_VUE_PATH ARG ENVIRONMENT ENV VITE_DOCS_BASEPATH=$VITE_DOCS_BASEPATH +ENV NUXT_APP_BASE_URL=$VITE_DOCS_BASEPATH ENV VITE_DOCS_EXAMPLES_REACT_PATH=$VITE_DOCS_EXAMPLES_REACT_PATH ENV VITE_DOCS_EXAMPLES_VUE_PATH=$VITE_DOCS_EXAMPLES_VUE_PATH ENV ENVIRONMENT=$ENVIRONMENT -COPY . . RUN yarn RUN ENV_NAME=$ENVIRONMENT yarn build:replace-assets-url-with RUN yarn build:vue diff --git a/.vuestorefrontcloud/router/docker/Dockerfile b/.vuestorefrontcloud/router/docker/Dockerfile index a2e73b7abd..74ac2119ce 100644 --- a/.vuestorefrontcloud/router/docker/Dockerfile +++ b/.vuestorefrontcloud/router/docker/Dockerfile @@ -6,4 +6,4 @@ ENV TARGET_DOMAIN=$TARGET_DOMAIN COPY .vuestorefrontcloud/router/docker/default.conf.template /etc/nginx/conf.d/default.conf.template -RUN envsubst < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf +RUN envsubst '$TARGET_DOMAIN' < /etc/nginx/conf.d/default.conf.template > /etc/nginx/conf.d/default.conf diff --git a/apps/docs/components/nuxt.config.ts b/apps/docs/components/nuxt.config.ts index f22e712e8a..9131e66ece 100644 --- a/apps/docs/components/nuxt.config.ts +++ b/apps/docs/components/nuxt.config.ts @@ -3,8 +3,6 @@ export default defineNuxtConfig({ extends: ['sf-docs-base'], app: { - baseURL: process.env.VITE_DOCS_BASEPATH ?? '', - head: { link: [ { @@ -15,10 +13,10 @@ export default defineNuxtConfig({ }, }, robots: { - enabled: false + enabled: false, }, sitemap: { - enabled: false + enabled: false, }, // fix via https://github.com/nuxt/content/issues/2254 alias: {