diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index f1f0b7a..40f6a92 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -13,6 +13,9 @@ "--privileged", "--init" ], + "remoteEnv": { + "DOCKER_ARGS": "--network=host" + }, // Add the IDs of extensions you want installed when the container is created. "extensions": [ "ms-azuretools.vscode-docker" diff --git a/gitlab/bootstrap/setup.sh b/gitlab/bootstrap/setup.sh index 021ce64..27006ba 100755 --- a/gitlab/bootstrap/setup.sh +++ b/gitlab/bootstrap/setup.sh @@ -33,10 +33,6 @@ else docker exec -it gitlab update-permissions &> /dev/null fi -# allow valet to talk to GitLab by removing network isolation between containers -export DOCKER_ARGS="--network=host" -`grep -q "export DOCKER_ARGS=" ~/.bashrc || echo 'export DOCKER_ARGS="--network=host"' >> ~/.bashrc` - echo -e "Waiting for GitLab to be ready. This might take a while \U23F0" until $(curl --output /dev/null --silent --head --fail http://localhost); do printf '.' diff --git a/jenkins/bootstrap/setup.sh b/jenkins/bootstrap/setup.sh index 5947fa4..e843745 100755 --- a/jenkins/bootstrap/setup.sh +++ b/jenkins/bootstrap/setup.sh @@ -18,10 +18,6 @@ else docker run -d --name jenkins -p 8080:8080 --env JENKINS_ADMIN_ID=$username --env JENKINS_ADMIN_PASSWORD=$password jenkins:$container_name fi -# allow valet to talk to Jenkins by removing network isolation between containers -export DOCKER_ARGS="--network=host" -grep -q "export DOCKER_ARGS=" ~/.bashrc || echo 'export DOCKER_ARGS="--network=host"' >> ~/.bashrc - echo -e "\nWaiting for Jenkins to start..." while ! curl -s http://localhost:8080/ > /dev/null; do printf "."