Skip to content

Commit 6a77498

Browse files
Chore remove portainer healthcheck (#26)
* move portainer UI healtcheck to separate variable * bump version traefik & portainer * fix double slash in path * gut pipeline * remove ubuntu FocalFossa support to fix pipeline * container deployment in pipeline broken
1 parent 31a8bae commit 6a77498

5 files changed

Lines changed: 14 additions & 18 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
distro:
4343
- ubuntu2404
4444
- ubuntu2204
45-
- ubuntu2004
45+
- debian13
4646
- debian12
4747
- debian11
4848

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ Depending on what loadout you wanna achieve:
4444
docker_install_watchtower: true
4545
docker_install_portainer: true
4646
docker_install_portainer_agent: true
47+
docker_portainer_healthcheck:
48+
test: "wget --no-verbose --no-check-certificate --tries=1 --spider https://localhost:9443 || exit 1"
49+
interval: 30s
50+
timeout: 5s
51+
retries: 3
52+
start_period: 20s
4753
roles:
4854
- ansible_role_docker_stack
4955
```

defaults/main.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ docker_install_portainer_agent: false
77
# -- portainer -----------------
88
docker_portainer_image: portainer/portainer-ce
99
# renovate: depName=portainer/portainer
10-
docker_portainer_version: "2.27.8"
10+
docker_portainer_version: "2.33.2"
1111
docker_portainer_parameter: "" # e.g.--logo
12+
docker_portainer_healthcheck: {} # See README
1213
# -- traefik -------------------
1314
# renovate: depName=traefik
14-
docker_traefik_version: "v2.11"
15+
docker_traefik_version: "v3.6.2"
1516
docker_traefik_custom_environment: {}
16-
docker_traefik_path: "/opt/traefik/"
17+
docker_traefik_path: "/opt/traefik"
1718
docker_traefik_network_name: "proxy"
1819
docker_traefik_network_enable_ipv6: false
1920
docker_traefik_entrypoint_name_http: "web"

molecule/default/converge.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,12 @@
33
hosts: all
44
become: true
55

6-
vars:
7-
docker_install_traefik: true
8-
docker_install_watchtower: true
9-
docker_install_portainer: true
10-
docker_install_portainer_agent: true
11-
126
pre_tasks:
137
- name: Update apt cache.
148
ansible.builtin.apt:
159
update_cache: true
1610
cache_valid_time: 600
17-
when: ansible_os_family == 'Debian'
11+
when: ansible_facts["os_family"] == 'Debian'
1812

1913
- name: Wait for systemd to complete initialization.
2014
ansible.builtin.command: systemctl is-system-running
@@ -24,7 +18,7 @@
2418
'degraded' in systemctl_status.stdout
2519
retries: 30
2620
delay: 5
27-
when: ansible_service_mgr == 'systemd'
21+
when: ansible_facts["service_mgr"] == 'systemd'
2822
changed_when: false
2923
failed_when: systemctl_status.rc > 1
3024
- name: Run docker install role

tasks/docker-portainer.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,4 @@
5555
volumes: "{{ portainer_volumes }}"
5656
state: started
5757
labels: "{{ portainer_labels | default({}) }}"
58-
healthcheck:
59-
test: "wget --no-verbose --no-check-certificate --tries=1 --spider https://localhost:9443 || exit 1"
60-
interval: 30s
61-
timeout: 5s
62-
retries: 3
63-
start_period: 20s
58+
healthcheck: "{{ docker_portainer_healthcheck }}"

0 commit comments

Comments
 (0)