From 572452bc8f402c62dcdb4d178202d6396884b9bf Mon Sep 17 00:00:00 2001 From: Emmett Butler Date: Fri, 20 Sep 2024 11:10:47 -0700 Subject: [PATCH] simplify --- .../auto-inject/auto-inject_init_vm_config.yml | 10 ---------- .../auto-inject/docker/auto-inject_prepare_docker.yml | 3 +-- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/utils/build/virtual_machine/provisions/auto-inject/auto-inject_init_vm_config.yml b/utils/build/virtual_machine/provisions/auto-inject/auto-inject_init_vm_config.yml index ae55655d72..83bb5d2bd9 100644 --- a/utils/build/virtual_machine/provisions/auto-inject/auto-inject_init_vm_config.yml +++ b/utils/build/virtual_machine/provisions/auto-inject/auto-inject_init_vm_config.yml @@ -61,16 +61,6 @@ #sudo yum -y update sudo systemctl restart sshd.service -- os_type: linux - os_distro: rpm - os_branch: fedora - remote-command: | - echo 'AcceptEnv DD_*' | sudo tee -a /etc/ssh/sshd_config - sudo id -u datadog &>/dev/null || sudo useradd -m datadog - sudo yum clean expire-cache - #sudo yum -y update - sudo systemctl restart sshd.service - - os_type: linux os_distro: rpm remote-command: | diff --git a/utils/build/virtual_machine/provisions/auto-inject/docker/auto-inject_prepare_docker.yml b/utils/build/virtual_machine/provisions/auto-inject/docker/auto-inject_prepare_docker.yml index 382fb5ba5b..65f2942bb5 100644 --- a/utils/build/virtual_machine/provisions/auto-inject/docker/auto-inject_prepare_docker.yml +++ b/utils/build/virtual_machine/provisions/auto-inject/docker/auto-inject_prepare_docker.yml @@ -30,9 +30,8 @@ os_distro: rpm os_branch: fedora remote-command: | - sudo dnf -y install dnf-plugins-core sudo dnf config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo - sudo dnf install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin + sudo dnf install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin sudo systemctl start docker - os_type: linux os_distro: rpm