Skip to content

Commit bc4e12e

Browse files
committed
Merge develop into master for v1.2.0 release
This release includes: - Conditional removal of housekeeping service for netbox-docker >= 3.4.0
2 parents e6270cd + 267c892 commit bc4e12e

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

templates/docker-compose.yml.j2

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ services:
143143
limits: {{ netbox_resources_limits | to_json }}
144144
{% endif %}
145145

146+
{% if netbox_netbox_docker_version is version('3.4.0', '<') %}
146147
netbox-housekeeping:
147148
<<: *netbox-worker
148149
command:
@@ -158,6 +159,7 @@ services:
158159
resources:
159160
limits: {{ netbox_resources_limits | to_json }}
160161
{% endif %}
162+
{% endif %}
161163

162164
postgres:
163165
image: {{ netbox_postgres_image }}

0 commit comments

Comments
 (0)