Removed unnecessary external network in CI.

drevops · Sep 7, 2024 · d040abd · d040abd · github-actions · Sep 7, 2024
1 parent 3859c11
commit d040abd
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 35 deletions.
diff --git 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/.vortex/tests/bats/fixtures/docker-compose.env.json b/.vortex/tests/bats/fixtures/docker-compose.env.json
@@ -1,11 +1,6 @@
 {
     "name": "star_wars",
     "networks": {
-        "amazeeio-network": {
-            "external": true,
-            "ipam": [],
-            "name": "amazeeio-network"
-        },
         "default": {
             "ipam": [],
             "name": "star_wars_default"
@@ -258,7 +253,6 @@
                 "lagoon.type": "nginx-php-persistent"
             },
             "networks": {
-                "amazeeio-network": null,
                 "default": null
             },
             "user": "1000",

diff --git a/.vortex/tests/bats/fixtures/docker-compose.env_local.json b/.vortex/tests/bats/fixtures/docker-compose.env_local.json
@@ -1,11 +1,6 @@
 {
     "name": "star_wars",
     "networks": {
-        "amazeeio-network": {
-            "external": true,
-            "ipam": [],
-            "name": "amazeeio-network"
-        },
         "default": {
             "ipam": [],
             "name": "star_wars_default"
@@ -258,7 +253,6 @@
                 "lagoon.type": "nginx-php-persistent"
             },
             "networks": {
-                "amazeeio-network": null,
                 "default": null
             },
             "user": "1000",

diff --git a/.vortex/tests/bats/fixtures/docker-compose.env_mod.json b/.vortex/tests/bats/fixtures/docker-compose.env_mod.json
@@ -1,11 +1,6 @@
 {
     "name": "the_matrix",
     "networks": {
-        "amazeeio-network": {
-            "external": true,
-            "ipam": [],
-            "name": "amazeeio-network"
-        },
         "default": {
             "ipam": [],
             "name": "the_matrix_default"
@@ -258,7 +253,6 @@
                 "lagoon.type": "nginx-php-persistent"
             },
             "networks": {
-                "amazeeio-network": null,
                 "default": null
             },
             "user": "1000",

diff --git a/.vortex/tests/bats/fixtures/docker-compose.noenv.json b/.vortex/tests/bats/fixtures/docker-compose.noenv.json
@@ -1,11 +1,6 @@
 {
     "name": "star_wars",
     "networks": {
-        "amazeeio-network": {
-            "external": true,
-            "ipam": [],
-            "name": "amazeeio-network"
-        },
         "default": {
             "ipam": [],
             "name": "star_wars_default"
@@ -258,7 +253,6 @@
                 "lagoon.type": "nginx-php-persistent"
             },
             "networks": {
-                "amazeeio-network": null,
                 "default": null
             },
             "user": "1000",

diff --git 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: {}