Skip to content

Commit 84f5b8e

Browse files
fedejaurefedejaure
committed
Fix netalertx config
1 parent b39df17 commit 84f5b8e

6 files changed

Lines changed: 64 additions & 25 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
55
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
66

77
## [Unreleased]
8+
### Added
9+
- Otacon `netalertx/netalertx` to `26.8.5`.
10+
11+
### Changed
12+
- Otacon/Ocelot `nginxproxy/nginx-proxy` to `1.11.6`.
13+
- Otacon/Ocelot `tecnativa/docker-socket-proxy` to `v0.5.0`.
14+
- Otacon/Ocelot `traefik/whoami` to `v1.12.0`.
15+
- Otacon/Ocelot `traefik/whoami` to `v2.12.0`.
16+
- Ocelot `octoprint/octoprint` to `1.11.8`.
17+
- Otacon `pihole/pihole` to `2026.07.2`.
818

919
## [0.6.0] - 2026-08-21
1020
### Added

‎playbooks/handlers/main.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,18 @@
77
- name: Prune services
88
community.docker.docker_prune:
99
containers: true
10-
images: true
1110
networks: true
1211
volumes: true
1312
builder_cache: true
1413
listen: prune services is required
1514

15+
- name: Prune unused docker images
16+
community.docker.docker_prune:
17+
images: true
18+
images_filters:
19+
dangling: false
20+
listen: prune unused docker images is required
21+
1622
- name: Setup swap file
1723
ansible.builtin.command: dphys-swapfile setup
1824
register: swap_setup

‎playbooks/tasks/raspbian-init.yml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,3 +77,24 @@
7777
mode: "0644"
7878
loop: "{{ rpi_swap_config | dict2items }}"
7979
notify: setup swap file is required
80+
81+
- name: Ensure cgroup arguments have the correct values
82+
ansible.builtin.replace:
83+
path: /boot/firmware/cmdline.txt
84+
# Matches key=anything, but skips if it already has the correct value
85+
regexp: '^(?!.*{{ item.key }}={{ item.value }})(.*){{ item.key }}=\S+(.*)$'
86+
replace: '\1{{ item.key }}={{ item.value }}\2'
87+
loop: &cgroup_items
88+
- { key: 'cgroup_enable', value: 'cpuset' }
89+
- { key: 'cgroup_enable', value: 'memory' }
90+
- { key: 'cgroup_memory', value: '1' }
91+
notify: reboot raspi is required
92+
93+
- name: Append cgroup arguments if they are completely missing
94+
ansible.builtin.replace:
95+
path: /boot/firmware/cmdline.txt
96+
# Only matches if the key doesn't exist on the line at all
97+
regexp: '^((?!.*{{ item.key }}=\S+).*)$'
98+
replace: '\1 {{ item.key }}={{ item.value }}'
99+
loop: *cgroup_items
100+
notify: reboot raspi is required

‎playbooks/tasks/services.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,14 @@
9797
with_items: "{{ rpi_docker_compose_project_config.templates }}"
9898
register: services
9999

100-
- name: Create and start services
100+
- name: Create, update, and start services
101101
community.docker.docker_compose_v2:
102102
project_src: "{{ rpi_docker_compose_project }}"
103103
build: "policy"
104+
pull: "missing"
104105
remove_orphans: true
105-
state: "restarted"
106+
state: "present"
106107
when: services.changed # noqa no-handler
107108
notify:
108109
- prune services is required
110+
- prune unused docker images is required

‎playbooks/templates/ocelot/docker-compose.yml.j2‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ services:
33
nginx-proxy:
44
container_name: nginx-proxy
55
hostname: nginx-proxy.{{ rpi_hostname }}
6-
image: nginxproxy/nginx-proxy:1.11.2
6+
image: nginxproxy/nginx-proxy:1.11.6
77
restart: always
8-
privileged: {{ (molecule_yml is defined) | string | lower }}
8+
privileged: {{ 'true' if molecule_yml is defined else 'false' }}
99
ports:
1010
- "80:80"
1111
volumes:
@@ -17,7 +17,7 @@ services:
1717
docker-proxy:
1818
container_name: docker-proxy
1919
hostname: docker-proxy.{{ rpi_hostname }}
20-
image: tecnativa/docker-socket-proxy:v0.4.2
20+
image: tecnativa/docker-socket-proxy:v0.5.0
2121
restart: always
2222
privileged: true
2323
volumes:
@@ -29,7 +29,7 @@ services:
2929
container_name: jump
3030
hostname: jump.{{ rpi_hostname }}
3131
restart: always
32-
privileged: {{ (molecule_yml is defined) | string | lower }}
32+
privileged: {{ 'true' if molecule_yml is defined else 'false' }}
3333
image: daledavies/jump:v1.4.1
3434
expose:
3535
- 8080
@@ -53,19 +53,19 @@ services:
5353
whoami:
5454
container_name: whoami
5555
hostname: whoami.{{ rpi_hostname }}
56-
image: traefik/whoami:v1.11.0
56+
image: traefik/whoami:v1.12.0
5757
restart: always
58-
privileged: {{ (molecule_yml is defined) | string | lower }}
58+
privileged: {{ 'true' if molecule_yml is defined else 'false' }}
5959
environment:
6060
- VIRTUAL_HOST={{ rpi_docker_compose_project_config.virtual_hosts.whoami }}
6161
- WHOAMI_NAME={{ rpi_hostname }}
6262

6363
netdata:
6464
container_name: netdata
6565
hostname: netdata.{{ rpi_hostname }}
66-
image: netdata/netdata:v2.10.2
66+
image: netdata/netdata:v2.11.0
6767
restart: always
68-
privileged: {{ (molecule_yml is defined) | string | lower }}
68+
privileged: {{ 'true' if molecule_yml is defined else 'false' }}
6969
expose:
7070
- "19999"
7171
volumes:
@@ -92,9 +92,9 @@ services:
9292
octoprint:
9393
container_name: octoprint
9494
hostname: octoprint.{{ rpi_hostname }}
95-
image: octoprint/octoprint:1.11.7
95+
image: octoprint/octoprint:1.11.8
9696
restart: always
97-
privileged: {{ (molecule_yml is defined) | string | lower }}
97+
privileged: {{ 'true' if molecule_yml is defined else 'false' }}
9898
environment:
9999
- VIRTUAL_HOST={{ rpi_docker_compose_project_config.virtual_hosts.octoprint }}
100100
- ENABLE_MJPG_STREAMER=true

‎playbooks/templates/otacon/docker-compose.yml.j2‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ services:
33
nginx-proxy:
44
container_name: nginx-proxy
55
hostname: nginx-proxy.{{ rpi_hostname }}
6-
image: nginxproxy/nginx-proxy:1.11.2
6+
image: nginxproxy/nginx-proxy:1.11.6
77
restart: always
8-
privileged: {{ (molecule_yml is defined) | string | lower }}
8+
privileged: {{ 'true' if molecule_yml is defined else 'false' }}
99
ports:
1010
- "80:80"
1111
volumes:
@@ -14,7 +14,7 @@ services:
1414
docker-proxy:
1515
container_name: docker-proxy
1616
hostname: docker-proxy.{{ rpi_hostname }}
17-
image: tecnativa/docker-socket-proxy:v0.4.2
17+
image: tecnativa/docker-socket-proxy:v0.5.0
1818
restart: always
1919
privileged: true
2020
volumes:
@@ -26,7 +26,7 @@ services:
2626
container_name: jump
2727
hostname: jump.{{ rpi_hostname }}
2828
restart: always
29-
privileged: {{ (molecule_yml is defined) | string | lower }}
29+
privileged: {{ 'true' if molecule_yml is defined else 'false' }}
3030
image: daledavies/jump:v1.4.1
3131
expose:
3232
- 8080
@@ -50,19 +50,19 @@ services:
5050
whoami:
5151
container_name: whoami
5252
hostname: whoami.{{ rpi_hostname }}
53-
image: traefik/whoami:v1.11.0
53+
image: traefik/whoami:v1.12.0
5454
restart: always
55-
privileged: {{ (molecule_yml is defined) | string | lower }}
55+
privileged: {{ 'true' if molecule_yml is defined else 'false' }}
5656
environment:
5757
- VIRTUAL_HOST={{ rpi_docker_compose_project_config.virtual_hosts.whoami }}
5858
- WHOAMI_NAME={{ rpi_hostname }}
5959

6060
netdata:
6161
container_name: netdata
6262
hostname: netdata.{{ rpi_hostname }}
63-
image: netdata/netdata:v2.10.3
63+
image: netdata/netdata:v2.11.0
6464
restart: always
65-
privileged: {{ (molecule_yml is defined) | string | lower }}
65+
privileged: {{ 'true' if molecule_yml is defined else 'false' }}
6666
expose:
6767
- "19999"
6868
volumes:
@@ -89,9 +89,9 @@ services:
8989
pihole:
9090
container_name: pihole
9191
hostname: pihole.{{ rpi_hostname }}
92-
image: pihole/pihole:2026.06.0
92+
image: pihole/pihole:2026.07.2
9393
restart: always
94-
privileged: {{ (molecule_yml is defined) | string | lower }}
94+
privileged: {{ 'true' if molecule_yml is defined else 'false' }}
9595
ports:
9696
- "53:53/tcp"
9797
- "53:53/udp"
@@ -132,9 +132,9 @@ services:
132132
netalertx:
133133
container_name: netalertx
134134
hostname: netalertx.{{ rpi_hostname }}
135-
image: ghcr.io/netalertx/netalertx:26.4.6
135+
image: ghcr.io/netalertx/netalertx:26.8.5
136136
restart: always
137-
privileged: {{ (molecule_yml is defined) | string | lower }}
137+
privileged: {{ 'true' if molecule_yml is defined else 'false' }}
138138
network_mode: host # Use host networking for ARP scanning and other services
139139

140140
read_only: true # Make the container filesystem read-only

0 commit comments

Comments
 (0)