Merge branch 'main' into feature/circleci-labs

jenkins/5-custom-transformers.md

@@ -205,7 +205,7 @@ Now you can perform another `dry-run` command with the `--custom-transformers` C
 
 You can also use custom transformers to edit the values of environment variables in converted workflows. In this example, you will be updating the `DB_ENGINE` environment variable to be `mongodb` instead of `sqlite`.
 
-To do this, add the following code to the `transformers.rb` file.
+To do this, add the following code at the top of the `transformers.rb` file.
 
 ```ruby
 env "DB_ENGINE", "mongodb"

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 "."