From eaf360ed3fa96996d0fc8c526f2777fb10d47874 Mon Sep 17 00:00:00 2001 From: Byeonggon Lee Date: Thu, 27 Jul 2023 12:14:26 +0900 Subject: [PATCH] fix: Devcontainer resets /etc/hosts (#11439) (#11440) Signed-off-by: Byeonggon Lee --- .devcontainer/devcontainer.json | 10 +++++++++- .devcontainer/pre-build.sh | 7 ------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 411aa3c45ba7..4b2b51a30bc6 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -13,9 +13,17 @@ "hostRequirements": { "cpus": 4 }, + "runArgs": [ + "--add-host=host.docker.internal:host-gateway", + "--add-host=dex:127.0.0.1", + "--add-host=minio:127.0.0.1", + "--add-host=postgres:127.0.0.1", + "--add-host=mysql:127.0.0.1", + "--add-host=azurite:127.0.0.1" + ], "onCreateCommand": ".devcontainer/pre-build.sh", "workspaceMount": "source=${localWorkspaceFolder},target=/home/vscode/go/src/github.com/argoproj/argo-workflows,type=bind", - "workspaceFolder": "/home/vscode/go/src/github.com/argoproj/argo-workflows" + "workspaceFolder": "/home/vscode/go/src/github.com/argoproj/argo-workflows", "remoteEnv": { "PATH": "${containerEnv:PATH}:/home/vscode/go/bin", "GOPATH": "/home/vscode/go" diff --git a/.devcontainer/pre-build.sh b/.devcontainer/pre-build.sh index 3c028bd84d26..f6ada6bb8d65 100755 --- a/.devcontainer/pre-build.sh +++ b/.devcontainer/pre-build.sh @@ -1,13 +1,6 @@ #!/usr/bin/env sh set -eux -# Add hosts -sudo bash -c 'echo "127.0.0.1 dex" >> /etc/hosts' -sudo bash -c 'echo "127.0.0.1 minio" >> /etc/hosts' -sudo bash -c 'echo "127.0.0.1 postgres" >> /etc/hosts' -sudo bash -c 'echo "127.0.0.1 mysql" >> /etc/hosts' -sudo bash -c 'echo "127.0.0.1 azurite" >> /etc/hosts' - # install kubernetes wget -q -O - https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash k3d cluster get k3s-default || k3d cluster create --image rancher/k3s:v1.27.3-k3s1 --wait