Skip to content

Commit 5183c47

Browse files
authored
Merge pull request GoogleCloudPlatform#4229 from tpdownes/remove_docker_config_warning
Remove Docker configuration warning
2 parents 84d8861 + a2cc4ae commit 5183c47

2 files changed

Lines changed: 1 addition & 17 deletions

File tree

modules/scripts/startup-script/files/install_docker.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,7 @@
4343
dest: /etc/docker/daemon.json
4444
mode: '0644'
4545
content: '{{ docker_daemon_config }}'
46-
# validate flag requires Docker server version 23.0 and above
47-
# can add this back after private A3 DLVM image is deprecated
48-
# this image comes with Docker version 20.10.17
49-
# validate: /usr/bin/dockerd --validate --config-file %s
46+
validate: /usr/bin/dockerd --validate --config-file %s
5047
when: docker_daemon_config
5148
notify:
5249
- Restart Docker

modules/scripts/startup-script/main.tf

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -254,19 +254,6 @@ locals {
254254
}
255255
}
256256

257-
check "health_check" {
258-
assert {
259-
condition = local.docker_config == {}
260-
error_message = <<-EOT
261-
This message is only a warning. The Toolkit performs no validation of the
262-
Docker daemon configuration. VM startup scripts will fail if the file is not
263-
a valid Docker JSON configuration. Please review the Docker documentation:
264-
265-
https://docs.docker.com/engine/daemon/
266-
EOT
267-
}
268-
}
269-
270257
resource "random_id" "resource_name_suffix" {
271258
byte_length = 4
272259
}

0 commit comments

Comments
 (0)