From b54dea56831fb4ac54ff582110bf8a02b57834fb Mon Sep 17 00:00:00 2001
From: Remi PLANEL <rplanel@pasteur.fr>
Date: Wed, 20 Sep 2023 16:06:45 +0200
Subject: [PATCH] build-args: nuxt_app_base_url to base_url
---
.gitlab-ci.yml | 2 +-
nuxt.config.ts | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 49a1f6c0..0c8fdaca 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ stages:
- 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 "NUXT_APP_BASE_URL=/wiki/" -f $DOCKERFILE $CONTEXT
+ - docker build --pull -t "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA" --build-arg "BASE_URL=/wiki/" -f $DOCKERFILE $CONTEXT
- docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA"
# build:
diff --git a/nuxt.config.ts b/nuxt.config.ts
index 60c5287a..6a2750ee 100644
--- a/nuxt.config.ts
+++ b/nuxt.config.ts
@@ -14,8 +14,8 @@ export default defineNuxtConfig({
devtools: {
enabled: false
},
- // app: {
- // baseURL: '/wiki',
- // }
+ app: {
+ baseURL: '/wiki',
+ }
})
--
GitLab