diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4a947922d8233505c34350b1bcf8732ffc33f6a2..b73d2736007a27d2cd5716a57e5a6ad781966758 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}" 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" @@ -416,7 +420,6 @@ sync-zotero: - *docker-login script: - echo $MEILI_HOST - - echo $MEILI_API_KEY - > docker buildx build --pull -t "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$CI_COMMIT_SHORT_SHA" --build-arg "BASE_URL=$BASE_URL" @@ -450,7 +453,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" @@ -517,7 +520,7 @@ deploy:prod: variables: NODE_ENV: "production" KUBE_NAMESPACE: "defense-finder-prod" - PUBLIC_URL: "${HOST_PROD}" + PUBLIC_URL: "https://${HOST_PROD}" CI_DEBUG_TRACE: "false" ENV: "production" environment: @@ -601,7 +604,7 @@ create-structures-archives:prod: variables: NODE_ENV: "production" KUBE_NAMESPACE: "defense-finder-prod" - PUBLIC_URL: "${HOST_PROD}" + PUBLIC_URL: "https://${HOST_PROD}" CI_DEBUG_TRACE: "false" ENV: "production" environment: diff --git a/deploy/df-wiki/values.yaml b/deploy/df-wiki/values.yaml index 1f56ee87cad5c8bc3d72797a8fb11ebab2a7e458..f35659908ad58a4e5a79602e5b0fa1515125ef58 100644 --- a/deploy/df-wiki/values.yaml +++ b/deploy/df-wiki/values.yaml @@ -35,6 +35,7 @@ securityContext: runAsNonRoot: true runAsUser: 101 runAsGroup: 101 + allowPrivilegeEscalation: false # capabilities: # drop: # - ALL 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 b722a7a7cf965837c610584c1c2a086f660cd039..b0b1d56fe9085b77fae2adad74b5a3c85433750f 100644 --- a/packages/df-wiki-cli/df_wiki_cli/meilisearch/main.py +++ b/packages/df-wiki-cli/df_wiki_cli/meilisearch/main.py @@ -137,7 +137,9 @@ def get_env_var( keys = client.get_keys() api_key = [res.key for res in keys.results if res.name == "Default Search API Key"] + print(ctx.obj.host) if len(api_key) == 1: with open(output, "a") as outfile: - outfile.write(f"MEILI_HOST={ctx.obj.host}\n") - outfile.write(f"MEILI_API_KEY={api_key[0]}\n") + print(ctx.obj.host) + outfile.write(f'MEILI_HOST="{ctx.obj.host}"\n') + outfile.write(f'MEILI_API_KEY="{api_key[0]}"\n')