From 1aebaaf973618d8f2222779739f8de38d77b6942 Mon Sep 17 00:00:00 2001 From: Pierre Boissinot Date: Tue, 2 Jul 2024 14:42:01 +0200 Subject: [PATCH] feat(private-registry): add gitlab-token Composer auth (#51) * feat(private-registry): add gitlab-token Composer auth * doc(private-registry): update changelog for 1.12.0 version * doc(private-registry): update changelog for 1.12.0 version --- CHANGELOG.md | 6 ++++++ config/before_composer.yml | 2 +- config/steps/composer/private_registry.yml | 2 +- docs/composer/private-registry.md | 2 +- templates/composer/auth.json.j2 | 4 +++- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54b2bd9..6c70b6e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [1.12.0](https://github.com/le-phare/ansible-deploy/compare/v1.11.0...v1.12.0) (2024-07-02) + +### Features + +* **private registry:** allow set gitlab-token Composer auth ([#51](https://github.com/le-phare/ansible-deploy/pull/51))([6abce76](https://github.com/le-phare/ansible-deploy/pull/51/commits/6abce764e7654c7b807c63b68b66f3c8ee85c280)) + ## [1.11.0](https://github.com/le-phare/ansible-deploy/compare/v1.10.1...v1.11.0) (2023-09-28) ### Features diff --git a/config/before_composer.yml b/config/before_composer.yml index 59a5eed..fd58c21 100644 --- a/config/before_composer.yml +++ b/config/before_composer.yml @@ -1,5 +1,5 @@ - include_tasks: "../../lephare.ansible-deploy/config/steps/composer/private_registry.yml" - when: lephare_packagist_com_token is defined + when: lephare_packagist_com_token is defined or lephare_gitlab_token is defined - name: Set release environment variable shell: chdir={{ansistrano_release_path.stdout}} diff --git a/config/steps/composer/private_registry.yml b/config/steps/composer/private_registry.yml index d50e565..97554e8 100644 --- a/config/steps/composer/private_registry.yml +++ b/config/steps/composer/private_registry.yml @@ -10,4 +10,4 @@ src: composer/auth.json.j2 dest: "{{ lephare_composer_home }}/auth.json" mode: 0600 - when: lephare_packagist_com_token is defined + when: lephare_packagist_com_token is defined or lephare_gitlab_token is defined diff --git a/docs/composer/private-registry.md b/docs/composer/private-registry.md index 108e98e..2be1a29 100644 --- a/docs/composer/private-registry.md +++ b/docs/composer/private-registry.md @@ -2,7 +2,7 @@ ## Conditions -`lephare_packagist_com_token` must be set. +`lephare_packagist_com_token` or `lephare_gitlab_token` must be set. ## When diff --git a/templates/composer/auth.json.j2 b/templates/composer/auth.json.j2 index 94167f9..37a91d7 100644 --- a/templates/composer/auth.json.j2 +++ b/templates/composer/auth.json.j2 @@ -2,7 +2,9 @@ "bitbucket-oauth": {}, "github-oauth": {}, "gitlab-oauth": {}, - "gitlab-token": {}, + "gitlab-token": { + "gitlab.com": "{{ lephare_gitlab_token }}" + }, "http-basic": { "repo.packagist.com": { "username": "token",