diff --git a/.env b/.env index 021573bd..880334cd 100644 --- a/.env +++ b/.env @@ -23,7 +23,6 @@ MONGO_URL=mongodb://root@mongo:27017 SECRET_KEY_BASE=FuEn07fjnCLaC53BiDoBagPYdsv/S65QTfxWgusKP1BA5NiaFzXGYMHLZ6JAYxt1 GITLAB_PROJECT_ID=1 LENRA_EMAIL=contact@lenra.io -TEMPLATE_URL=https://github.com/lenra-io/templates#beta GITLAB_API_URL=https://gitlab.com/api/v4 API_ENDPOINT=localhost LENRA_APP_URL=http://localhost:8080 diff --git a/apps/lenra/lib/lenra/services/gitlab_api_services.ex b/apps/lenra/lib/lenra/services/gitlab_api_services.ex index 34dc3ee3..44bbe905 100644 --- a/apps/lenra/lib/lenra/services/gitlab_api_services.ex +++ b/apps/lenra/lib/lenra/services/gitlab_api_services.ex @@ -21,7 +21,6 @@ defmodule Lenra.GitlabApiServices do gitlab_project_id = Application.fetch_env!(:lenra, :gitlab_project_id) runner_secret = Application.fetch_env!(:lenra, :runner_secret) gitlab_ref = Application.fetch_env!(:lenra, :gitlab_ci_ref) - template_url = Application.fetch_env!(:lenra, :template_url) url = "#{gitlab_api_url}/projects/#{gitlab_project_id}/pipeline" @@ -43,8 +42,7 @@ defmodule Lenra.GitlabApiServices do "value" => "#{runner_callback_url}/runner/builds/#{build_id}?secret=#{runner_secret}" }, %{"key" => "APP_REPOSITORY", "value" => app_repository}, - %{"key" => "REPOSITORY_BRANCH", "value" => app_repository_branch}, - %{"key" => "FAAS_TEMPLATE_REPOSITORY", "value" => template_url} + %{"key" => "REPOSITORY_BRANCH", "value" => app_repository_branch} ] }) diff --git a/config/dev.exs b/config/dev.exs index f49c0398..a02aec44 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -137,7 +137,6 @@ config :lenra, "sZWshq6h0RNO9T1GgUnzLmPpDkSkDAoukmd30mTuwQAGIHYIIVdl7VD2h305" ), faas_secrets: ["gitlab-registry"], - template_url: System.get_env("TEMPLATE_URL", "https://github.com/lenra-io/templates.git#beta"), lenra_email: System.get_env("LENRA_EMAIL", "contact@lenra.io"), lenra_app_url: System.get_env("LENRA_APP_URL", "https://localhost:10000"), pipeline_runner: System.get_env("PIPELINE_RUNNER", "GitLab"), diff --git a/config/runtime.exs b/config/runtime.exs index 2aba541e..f54dadfa 100644 --- a/config/runtime.exs +++ b/config/runtime.exs @@ -26,7 +26,6 @@ if config_env() == :prod do gitlab_api_token: System.fetch_env!("GITLAB_API_TOKEN"), gitlab_project_id: System.fetch_env!("GITLAB_PROJECT_ID"), gitlab_ci_ref: "master", - template_url: System.fetch_env!("TEMPLATE_URL"), lenra_email: System.fetch_env!("LENRA_EMAIL"), lenra_app_url: System.fetch_env!("LENRA_APP_URL"), pipeline_runner: System.get_env("PIPELINE_RUNNER", "gitlab"), diff --git a/config/test.exs b/config/test.exs index 5c0119f4..318ef607 100644 --- a/config/test.exs +++ b/config/test.exs @@ -29,7 +29,6 @@ config :lenra, gitlab_project_id: "26231009", runner_secret: "test_secret", gitlab_ci_ref: "master", - template_url: "https://github.com/lenra-io/templates.git", lenra_email: "contact@lenra.io", lenra_app_url: "https://localhost:10000", pipeline_runner: "gitlab"