diff --git a/jobs/containers/spec b/jobs/containers/spec index 8b0fdd174..f49f7205a 100755 --- a/jobs/containers/spec +++ b/jobs/containers/spec @@ -38,6 +38,7 @@ properties: containers.links: Optional array of links to another containers (name:alias) containers.log_driver: Optional string containing the log driver for the container containers.log_options: Optional array of log driver options + containers.log_rotate: Optional content of a logrotate file for this container containers.lxc_options: Optional array of custom lxc options containers.mac_address: Optional string containing the container MAC address containers.memory: Optional string containing the memory limit to assign to the container (format: , where unit = b, k, m or g) diff --git a/jobs/containers/templates/bin/job_properties.sh.erb b/jobs/containers/templates/bin/job_properties.sh.erb index a431c9fdb..6efa339d3 100755 --- a/jobs/containers/templates/bin/job_properties.sh.erb +++ b/jobs/containers/templates/bin/job_properties.sh.erb @@ -144,6 +144,11 @@ export <%= container['name'] %>_log_driver="--log-driver=<%= container['log_driv export <%= container['name'] %>_log_options="<%= Array(container['log_options']).join(',').split(',').map { |log_option| "--log-opt=#{log_option}" }.join(' ') %>" <% end %> +<% if container['log_rotate'] %> +# Write log rotate file for the container +echo -e "<%= container['log_rotate'] %>" > /etc/logrotate.d/<%= container['name'] %> +<% end %> + <% unless container['lxc_options'].nil? || container['lxc_options'].empty? %> # Custom lxc options export <%= container['name'] %>_lxc_options="<%= Array(container['lxc_options']).join(',').split(',').map { |lxc_option| "--lxc-conf=#{lxc_option}" }.join(' ') %>"