diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 33034c17cbdc2a865c4a8c853f5e6a6cd95c9cad..438b5e8d3af3886e8a56dd7a4ae05422e3d1170b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -118,11 +118,11 @@ deploy:meilisearch:dev: CI_DEBUG_TRACE: "true" ENV: "development" PUBLIC_URL: $MEILI_HOST_DEV - KUBE_NAMESPACE: "defense-finder-dev" + KUBE_NAMESPACE: defense-finder-dev environment: name: k8sdev-01 - url: "https://${MEILI_HOST_DEV}" + url: https://${MEILI_HOST_DEV} deploy:meilisearch:prod: @@ -133,10 +133,10 @@ deploy:meilisearch:prod: CI_DEBUG_TRACE: "false" ENV: "production" PUBLIC_URL: $MEILI_HOST_PROD - KUBE_NAMESPACE: "defense-finder-prod" + KUBE_NAMESPACE: defense-finder-prod environment: name: k8sprod-02 - url: "https://${MEILI_HOST_PROD}" + url: https://${MEILI_HOST_PROD} ############### DELETE RELEASE @@ -413,7 +413,7 @@ sync-zotero: CONTEXT: "." DOCKERFILE: "Dockerfile" BASE_URL: / - MEILI_HOST: "http://localhost:7700" + MEILI_HOST: http://localhost:7700 before_script: - *docker-login script: @@ -421,7 +421,7 @@ sync-zotero: - > docker buildx build --pull -t "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA" --build-arg "BASE_URL=$BASE_URL" - --build-arg "MEILI_HOST=$MEILI_HOST" + --build-arg "MEILI_HOST=${MEILI_HOST}" --build-arg "MEILI_API_KEY=$MEILI_API_KEY" -f $DOCKERFILE $CONTEXT - docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA" @@ -435,7 +435,7 @@ build:dev:wiki: # - get-pfam variables: BASE_URL: /wiki/ - HOST_URL: "https://${HOST_DEV}" + HOST_URL: https://${HOST_DEV} before_script: - *docker-login # - "sed -i 's/MEILISEARCH_API_KEY/${$MEILI_API_KEY}/g' nuxt.config.ts" @@ -451,7 +451,7 @@ build:prod:wiki: # - get-pfam variables: BASE_URL: /wiki/ - HOST_URL: "https://${HOST_PROD}" + HOST_URL: https://${HOST_PROD} rules: - if: $CI_COMMIT_BRANCH == "main" @@ -498,14 +498,14 @@ deploy:dev: - "build:dev:wiki" when: manual variables: - NODE_ENV: "development" + NODE_ENV: development KUBE_NAMESPACE: "defense-finder-dev" - PUBLIC_URL: "https://${HOST_DEV}" + PUBLIC_URL: https://${HOST_DEV} CI_DEBUG_TRACE: "true" ENV: "development" environment: name: k8sdev-01 - url: "https://${HOST_DEV}" + url: https://${HOST_DEV} deploy:prod: @@ -516,14 +516,14 @@ deploy:prod: - "build:prod:wiki" when: manual variables: - NODE_ENV: "production" - KUBE_NAMESPACE: "defense-finder-prod" - PUBLIC_URL: "https://${HOST_PROD}" + NODE_ENV: production + KUBE_NAMESPACE: defense-finder-prod + PUBLIC_URL: https://${HOST_PROD} CI_DEBUG_TRACE: "false" ENV: "production" environment: name: k8sprod-02 - url: "https://${HOST_PROD}" + url: https://${HOST_PROD} delete-wiki-release:dev: rules: @@ -583,14 +583,14 @@ create-structures-archives:dev: needs: - "deploy:dev" variables: - NODE_ENV: "development" - KUBE_NAMESPACE: "defense-finder-dev" - PUBLIC_URL: "https://${HOST_DEV}" + NODE_ENV: development + KUBE_NAMESPACE: defense-finder-dev + PUBLIC_URL: https://${HOST_DEV} CI_DEBUG_TRACE: "true" ENV: "development" environment: name: k8sdev-01 - url: "https://${HOST_DEV}" + url: https://${HOST_DEV} create-structures-archives:prod: