From 34a881d559e1c68e819792e2f198b6f33faf1d2f Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Sat, 7 Sep 2024 09:34:46 +1000 Subject: [PATCH] Removed unnecessary external network in CI. --- .circleci/config.yml | 7 ------- docker-compose.yml | 8 ++++---- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b2558f369..467608512 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -105,10 +105,6 @@ aliases: docker_layer_caching: false version: default - # Set up container network. - - &step_setup_container_network - run: docker network prune -f >/dev/null 2>&1 && docker network inspect amazeeio-network >/dev/null 2>&1 || docker network create amazeeio-network >/dev/null 2>&1 || true - # Process the codebase to be run in CI environment. - &step_process_codebase_for_ci run: @@ -142,7 +138,6 @@ jobs: - checkout - *step_process_codebase_for_ci - *step_setup_remote_docker - - *step_setup_container_network - run: name: Create cache keys for database caching as files @@ -223,7 +218,6 @@ jobs: - checkout - *step_process_codebase_for_ci - *step_setup_remote_docker - - *step_setup_container_network #;< !PROVISION_USE_PROFILE - run: @@ -438,7 +432,6 @@ jobs: - checkout - *step_process_codebase_for_ci - *step_setup_remote_docker - - *step_setup_container_network - run: name: Run CircleCI tests (long) diff --git a/docker-compose.yml b/docker-compose.yml index 8acfc936c..ab64b49ab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -120,8 +120,8 @@ services: depends_on: - cli networks: - - amazeeio-network # This network is supported by Pygmy and used to route all requests to host machine. - default # This is a standard network and is used for all other environments, where requests routing is not required and/or not supported. + - amazeeio-network ### This network is supported by Pygmy and used to route all requests to host machine locally. Removed in CI. #;< LAGOON labels: lagoon.type: nginx-php-persistent # See https://docs.lagoon.sh/using-lagoon-advanced/service-types/ @@ -244,9 +244,9 @@ services: lagoon.type: none # Do not deploy in Lagoon. #;> LAGOON -networks: - amazeeio-network: - external: true +networks: ### Use external networks locally. Automatically removed in CI. + amazeeio-network: ### Automatically removed in CI. + external: true ### Automatically removed in CI. volumes: app: {}