From 8e3497fbd37a304ce719b5fe60e320486534a8e7 Mon Sep 17 00:00:00 2001 From: Adrien Waksberg Date: Tue, 7 May 2024 08:45:36 +0200 Subject: [PATCH] test: use personal docker registry --- CHANGELOG.md | 4 ++++ README.md | 23 +++++++++++------------ molecule/default/molecule.yml | 4 ++-- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ae2c82..bd04404 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,10 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/) - use multiple ssl certificates on one frontend - test: add support debian 12 +### Changed + +- test: use personal docker registry + ### Removed - test: remove support debian 10 diff --git a/README.md b/README.md index 499f6ae..14d836d 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ # Ansible role: Haproxy -[![Version](https://img.shields.io/badge/latest_version-1.1.0-green.svg)](https://git.yaegashi.fr/nishiki/ansible-role-haproxy/releases) -[![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](https://git.yaegashi.fr/nishiki/ansible-role-haproxy/src/branch/master/LICENSE) +[![Version](https://img.shields.io/badge/latest_version-1.1.0-green.svg)](https://code.waks.be/nishiki/ansible-role-haproxy/releases) +[![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](https://code.waks.be/nishiki/ansible-role-haproxy/src/branch/master/LICENSE) Install and configure haproxy ## Requirements -* Ansible >= 2.10 -* Debian - * Bullseye - * Bookworm +- Ansible >= 2.10 +- Debian + - Bullseye + - Bookworm ## Role variables @@ -82,7 +82,7 @@ Install and configure haproxy - dns1 127.0.0.1:53 ``` -- `haproxy_frontends` - hash with the frontends configuration +- `haproxy_frontends` - hash with the frontends configuration ``` fontend-https: @@ -162,7 +162,6 @@ Install and configure haproxy ..... ``` - - `haproxy_http_errors` - hash with http error groups ``` @@ -201,10 +200,10 @@ Install and configure haproxy ### Test with molecule and docker -* install [docker](https://docs.docker.com/engine/installation/) -* install `python3` and `python3-pip` -* install molecule and dependencies `pip3 install molecule 'molecule[docker]' docker ansible-lint testinfra yamllint` -* run `molecule test` +- install [docker](https://docs.docker.com/engine/installation/) +- install `python3` and `python3-pip` +- install molecule and dependencies `pip3 install molecule 'molecule[docker]' docker ansible-lint testinfra yamllint` +- run `molecule test` ## License diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 58f7769..68f5223 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -3,7 +3,7 @@ driver: name: docker platforms: - name: debian12 - image: nishiki/debian12:molecule + image: code.waks.be/nishiki/molecule:debian12 privileged: true volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw @@ -12,7 +12,7 @@ platforms: capabilities: - SYS_ADMIN - name: debian11 - image: nishiki/debian11:molecule + image: code.waks.be/nishiki/molecule:debian11 privileged: true volumes: - /sys/fs/cgroup:/sys/fs/cgroup:rw