diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a947922d8233505c34350b1bcf8732ffc33f6a2..617c752c04dbde461412e3d687f0ad6958207f72 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -360,12 +360,13 @@ update-meilisearch-index:prod: stage: get-meili-key variables: MEILI_HOST: "http://localhost:7700" + MEILI_HOST_NO_PROTOCOLE: "localhost:7700" script: - > df-wiki-cli meilisearch --key "${MEILI_MASTER_KEY}" - --host ${MEILI_HOST} + --host ${MEILI_HOST_NO_PROTOCOLE} get-env-var --output build.env artifacts: @@ -378,6 +379,7 @@ set-meili-env:dev: extends: .set-meili-env variables: MEILI_HOST: "https://${MEILI_HOST_DEV}" + MEILI_HOST_NO_PROTOCOLE: ${MEILI_HOST_DEV} rules: - if: $CI_COMMIT_BRANCH != "main" @@ -385,6 +387,8 @@ set-meili-env:prod: extends: .set-meili-env variables: MEILI_HOST: "https://${MEILI_HOST_PROD}" + MEILI_HOST_NO_PROTOCOLE: ${MEILI_HOST_PROD} + rules: - if: $CI_COMMIT_BRANCH == "main" diff --git a/packages/df-wiki-cli/df_wiki_cli/meilisearch/main.py b/packages/df-wiki-cli/df_wiki_cli/meilisearch/main.py index 031962611989cf0965ffa90e91695aad4f89de1e..e1644c064ccb98ffddac941ecea4c7484097b236 100644 --- a/packages/df-wiki-cli/df_wiki_cli/meilisearch/main.py +++ b/packages/df-wiki-cli/df_wiki_cli/meilisearch/main.py @@ -141,5 +141,5 @@ def get_env_var( if len(api_key) == 1: with open(output, "a") as outfile: print(ctx.obj.host) - outfile.write(f"MEILI_HOST='{ctx.obj.host}'\n") + outfile.write(f"MEILI_HOST={ctx.obj.host}\n") outfile.write(f"MEILI_API_KEY='{api_key[0]}'\n")