From 53fbd2a440f640fe9256e803081b6afd64f9075c Mon Sep 17 00:00:00 2001
From: Remi PLANEL <rplanel@pasteur.fr>
Date: Wed, 20 Sep 2023 12:37:30 +0200
Subject: [PATCH] can set NUXTNUXT_APP_BASE_URL at build time
---
.gitlab-ci.yml | 5 +++--
Dockerfile | 6 +++---
nuxt.config.ts | 1 -
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6935bea2..226e862e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,11 +18,12 @@ stages:
variables:
CONTEXT: "."
DOCKERFILE: "Dockerfile"
+ BASE_URL: /wiki/
before_script:
- i=0; while [ "$i" -lt 12 ]; do docker info && break; sleep 5; i=$(( i + 1 )) ; done
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script:
- - docker build --pull -t "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA" --build-arg="BUILD_OPTIONS=$OPTIONS" -f $DOCKERFILE $CONTEXT
+ - docker build --pull -t "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA" --build-arg="NUXT_APP_BASE_URL=$BASE_URL" -f $DOCKERFILE $CONTEXT
- docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA"
# build:
@@ -41,7 +42,7 @@ stages:
build:dev:
extends: .build
rules:
- - if: $CI_COMMIT_BRANCH != "main"
+ - if: $CI_COMMIT_BRANCH == "main"
.deploy:
stage: deploy
diff --git a/Dockerfile b/Dockerfile
index b8b4f9c6..8540d664 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,12 +42,12 @@ CMD [ "node", "server/index.mjs"]
### STAGE: Generate ###
FROM node:19.5-bullseye-slim as generate
-ARG NUXT_APP_BASE_URL
-
+ARG BASE_URL=/
+ENV NUXT_APP_BASE_URL=${BASE_URL}
WORKDIR /usr/src/app
COPY --from=install /usr/src/app ./
COPY . /usr/src/app
-RUN NUXT_APP_BASE_URL=/wiki npm run generate
+RUN npm run generate
### STAGE: NGINX ###
FROM nginxinc/nginx-unprivileged:1.25
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 37679542..04c36373 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -2,7 +2,6 @@
export default defineNuxtConfig({
modules: ['@nuxt/content', 'vuetify-nuxt-module', '@vueuse/nuxt'],
content: {
- api: { baseURL: '/wiki/api/_content' },
documentDriven: {
injectPage: false,
}
--
GitLab