diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c8fdacab15df77eaa47cd31bfb05bb6e726f340..ce046085b19e35101e55450d7d5040f95058caa9 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 "BASE_URL=/wiki/" -f $DOCKERFILE $CONTEXT + - docker build --pull -t "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA" --build-arg "BASE_URL=$BASE_URL" -f $DOCKERFILE $CONTEXT - docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA" # build: diff --git a/Dockerfile b/Dockerfile index 272cf189fec6ccd3cb7f190236a6d35976441027..b7e87c1cbce41b77126c5420aa550ed78dcc171c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,12 +41,7 @@ CMD [ "node", "server/index.mjs"] FROM node:19.5-bullseye-slim as generate ARG BASE_URL=/ -RUN echo "base_url" -RUN echo ${BASE_URL} - ENV NUXT_APP_BASE_URL=${BASE_URL} -RUN echo "the base url env var" -RUN echo ${NUXT_APP_BASE_URL} WORKDIR /usr/src/app COPY --from=install /usr/src/app ./