Update to 2022-11-08 12:00

This commit is contained in:
Daniel Berteaud 2022-11-08 12:00:08 +01:00
parent 3ec08a14f0
commit 6ffc0a5e16
4 changed files with 20 additions and 1 deletions

View File

@ -88,7 +88,7 @@ nomad_base_conf:
cpu: 200 cpu: 200
# can be expressed as number, in which case it'll be the amount of RAM to reserve in MB # can be expressed as number, in which case it'll be the amount of RAM to reserve in MB
# or as a percentage, in which case it'll be a percentage of the total RAM # or as a percentage, in which case it'll be a percentage of the total RAM
memory: 15% memory: 8%
# When memory is expressed as a percentage, you can set a minimum amount (in MB) which will be set # When memory is expressed as a percentage, you can set a minimum amount (in MB) which will be set
# if the percentage is less than that # if the percentage is less than that
memory_min: 500 memory_min: 500
@ -122,6 +122,15 @@ nomad_base_conf:
- namespace - namespace
- node_name - node_name
- node_id - node_id
# Authentication for OCI registries
# auths:
# - registry: oci.example.org
# login: foo
# password: bar
# - registry: docker.io
# login: daniel
# password: S3cr3t.
auths: []
raw_exec: raw_exec:
enabled: False enabled: False
java: java:

View File

@ -172,3 +172,7 @@
- key: net.bridge.bridge-nf-call-iptables - key: net.bridge.bridge-nf-call-iptables
val: 1 val: 1
tags: nomad tags: nomad
- name: Deploy Docker auth config
template: src=docker_auth.json.j2 dest={{ nomad_root_dir }}/docker/auth.json owner={{ nomad_user }} group={{ nomad_user }} mode=600
tags: nomad

View File

@ -32,6 +32,9 @@
- dir: etc - dir: etc
owner: root owner: root
mode: 755 mode: 755
- dir: docker
owner: root
mode: 755
- dir: tls - dir: tls
owner: root owner: root
mode: 755 mode: 755

View File

@ -109,6 +109,9 @@ client {
plugin "docker" { plugin "docker" {
config { config {
allow_privileged = {{ nomad_conf.client.task_drivers.docker.allow_privileged | ternary('true', 'false') }} allow_privileged = {{ nomad_conf.client.task_drivers.docker.allow_privileged | ternary('true', 'false') }}
auth {
config = "{{ nomad_root_dir }}/docker/auth.json"
}
{% if nomad_conf.client.task_drivers.docker.volumes.enabled %} {% if nomad_conf.client.task_drivers.docker.volumes.enabled %}
volumes { volumes {
enabled = true enabled = true