Staging upgrade preparation / Sept 30th

docker-compose.ccla-pack.yml

@@ -9,7 +9,7 @@ services:
   cld-automation-installer:
     depends_on:
       - msa-dev
-    image: openmsa/openmsa:cld-automation-installer-3.2.2-sha-6ab68a25a4642ef48314867fbb3add87986812d6
+    image: ubiqube/cld-automation-installer:sha-23bcb2379abdb07ea85c0923788dcfcd8f4bae32
     logging:
       <<: *logging
     volumes:
@@ -18,7 +18,7 @@ services:
   cld-blueprint-installer:
     depends_on:
       - msa-dev
-    image: openmsa/openmsa:cld-blueprint-installer-3.2.2-sha-1f4dac22a1467dab2daf4c10acdefb820bb315cc
+    image: ubiqube/cld-blueprint-installer:sha-1f4dac22a1467dab2daf4c10acdefb820bb315cc
     logging:
       <<: *logging
     volumes:
@@ -27,7 +27,7 @@ services:
   cld-cisco-ms-installer:
     depends_on:
       - msa-dev
-    image: openmsa/openmsa:cld-cisco-ms-installer-3.2.2-sha-4251bc22e2900ef0606f9beb458a073c0b903857
+    image: ubiqube/cld-cisco-ms-installer:sha-4251bc22e2900ef0606f9beb458a073c0b903857
     logging:
       <<: *logging
     volumes:
@@ -36,7 +36,7 @@ services:
   cld-fortinet-ms-installer:
     depends_on:
       - msa-dev
-    image: openmsa/openmsa:cld-fortinet-ms-installer-3.2.2-sha-d62f1dc7524baebee1acc5123e73084d2e382a26
+    image: ubiqube/cld-fortinet-ms-installer:sha-d62f1dc7524baebee1acc5123e73084d2e382a26
     logging:
       <<: *logging
     volumes:
@@ -45,7 +45,7 @@ services:
   cld-linux-ms-installer:
     depends_on:
       - msa-dev
-    image: openmsa/openmsa:cld-linux-ms-installer-3.2.2-sha-ce1222345c5ff881ed7c3c060185e674d2594df0
+    image: ubiqube/cld-linux-ms-installer:sha-ce1222345c5ff881ed7c3c060185e674d2594df0
     logging:
       <<: *logging
     volumes:
@@ -54,7 +54,7 @@ services:
   cld-netskope-ms-installer:
     depends_on:
       - msa-dev
-    image: openmsa/openmsa:cld-netskope-ms-installer-3.2.2-sha-1f77ef4f95d0d6374729f4a6cf4a8daa024668a7
+    image: ubiqube/cld-netskope-ms-installer:sha-1f77ef4f95d0d6374729f4a6cf4a8daa024668a7
     logging:
       <<: *logging
     volumes:
@@ -63,7 +63,7 @@ services:
   cld-paloalto-ngfw-installer:
     depends_on:
       - msa-dev
-    image: openmsa/openmsa:cld-paloalto-ngfw-installer-3.2.2-sha-35368719b7558753f37ea5df16595cdc3e29acc8
+    image: ubiqube/cld-paloalto-ngfw-installer:sha-35368719b7558753f37ea5df16595cdc3e29acc8
     logging:
       <<: *logging
     volumes:
@@ -72,7 +72,7 @@ services:
   cld-paloalto-prisma-ms-installer:
     depends_on:
       - msa-dev
-    image: openmsa/openmsa:cld-paloalto-prisma-ms-installer-3.2.2-sha-29e9ec7352d027301226eb137c2179dea60548a8
+    image: ubiqube/cld-paloalto-prisma-ms-installer:sha-29e9ec7352d027301226eb137c2179dea60548a8
     logging:
       <<: *logging
     volumes:
@@ -81,9 +81,46 @@ services:
   cld-zscaler-ms-installer:
     depends_on:
       - msa-dev
-    image: openmsa/openmsa:cld-zscaler-ms-installer-3.2.2-sha-5e47be5ed07a9e1c810d405bfe2cf36025bfe172
+    image: ubiqube/cld-zscaler-ms-installer:sha-93f728c321ed79d10be24fa00ce8bf816d186a45
     logging:
       <<: *logging
     volumes:
       - msa_repository:/opt/fmc_repository
       - msa_dev:/opt/devops/
+  msa-workflow-inventory-management:
+    depends_on:
+      - msa-dev
+    image: ubiqube/msa2-workflow-inventory-management:sha-9ee147ef8864e85e4c31ba21a8fae9aaaae1ca3d
+    logging:
+      <<: *logging
+    volumes:
+      - msa_repository:/opt/fmc_repository
+      - msa_dev:/opt/devops/
+  msa-ms-inventory-management:
+    depends_on:
+      - msa-dev
+    image: ubiqube/msa2-ms-inventory-management:sha-b28ae96821300678158d3cc5ff2917be559e14de
+    logging:
+      <<: *logging
+    volumes:
+      - msa_repository:/opt/fmc_repository
+      - msa_dev:/opt/devops/
+  msa-topology-wf:
+    depends_on:
+      - msa-dev
+    image: ubiqube/msa2-wf-topology:sha-a0bd68379dbd582cb727a85b0daf5a090239def1
+    logging:
+      <<: *logging
+    volumes:
+      - msa_repository:/opt/fmc_repository
+      - msa_dev:/opt/devops/
+  msa-tutorial-wf:
+    depends_on:
+      - msa-dev
+    image: ubiqube/msa2-wf-tutorial:sha-117f4fafb4beb12dd5a2fc94bc1aa55dd21c6f38
+    logging:
+      <<: *logging
+    volumes:
+      - msa_repository:/opt/fmc_repository
+      - msa_dev:/opt/devops/
+

docker-compose.ccla.yml

@@ -6,27 +6,28 @@ x-logging: &logging
     max-size: 10m
     mode: non-blocking
 services:
-  ccla-scan-app:
-    environment:
-      - UBIQUBE_ZAP_TOKEN=7da091fe-63a4-48c0-9bfa-7614c49feb7c
-    image: openmsa/openmsa:cloudclapp-scan-3.2.2-sha-d1303b2b66dfdafd870b501cdb91b9c5a1dc6465
-  ccla-scan-env:
-    entrypoint:
-      - zap.sh
-      - -daemon
-      - -host
-      - 0.0.0.0
-      - -config
-      - api.addrs.addr.name=.*
-      - -config
-      - api.addrs.addr.regex=true
-      - -config
-      - api.key=7da091fe-63a4-48c0-9bfa-7614c49feb7c
-      - -config
-      - network.localServers.mainProxy.alpn.enabled=false
-      - -config
-      - network.localServers.mainProxy.address=0.0.0.0
-    image: zaproxy/zap-stable:2.16.1
+  # commented to lighten the setup for now and focus on OPSLAB
+  # ccla-scan-app:
+  #   environment:
+  #     - UBIQUBE_ZAP_TOKEN=7da091fe-63a4-48c0-9bfa-7614c49feb7c
+  #   image: ubiqube/cloudclapp-scan:sha-d1303b2b66dfdafd870b501cdb91b9c5a1dc6465
+  # ccla-scan-env:
+  #   entrypoint:
+  #     - zap.sh
+  #     - -daemon
+  #     - -host
+  #     - 0.0.0.0
+  #     - -config
+  #     - api.addrs.addr.name=.*
+  #     - -config
+  #     - api.addrs.addr.regex=true
+  #     - -config
+  #     - api.key=7da091fe-63a4-48c0-9bfa-7614c49feb7c
+  #     - -config
+  #     - network.localServers.mainProxy.alpn.enabled=false
+  #     - -config
+  #     - network.localServers.mainProxy.address=0.0.0.0
+  #   image: zaproxy/zap-stable:2.16.1
   cloudclapp:
     depends_on:
       - msa-api
@@ -38,11 +39,11 @@ services:
       test:
         - CMD-SHELL
         - curl --fail http://localhost:8080
-    image: openmsa/openmsa:cloudclapp-3.2.2-sha-c6e95880c59b6dd9b72468f8f6ee03f1d39147af
+    image: ubiqube/cloudclapp:sha-997f8e0dc9c88819dd423d51e1a8a91d43e5cee8
   cloudclapp-bin:
     depends_on:
       - msa-dev
-    image: openmsa/openmsa:msa2-ccla-bin-installer-3.2.2-sha-823a5abecf8c97a44e40314a632b570f5a5eb2a7
+    image: ubiqube/msa2-ccla-bin-installer:sha-cd02a4308646fb9e5123d53165149580c72ff881
     logging:
       <<: *logging
     volumes:
@@ -51,7 +52,7 @@ services:
   cloudclapp-wf:
     depends_on:
       - msa-dev
-    image: openmsa/openmsa:msa2-ccla-wf-installer-3.2.2-sha-cc7bc20fafc364ef4a460f031ad081c24c4276f8
+    image: ubiqube/msa2-ccla-wf-installer:sha-0d045c4348aeee668372c18ca3eeafd9b9adc352
     logging:
       <<: *logging
     volumes:
@@ -95,12 +96,12 @@ services:
       - ./helm/files/nginx_ccla.conf:/etc/nginx/custom_conf.d/https/nginx_ccla.conf
   msa-sms:
     environment:
-      - UBIQUBE_INSTALL_AWS_CLI=true
+      - UBIQUBE_INSTALL_AWS_CLI=false
   opslab:
     depends_on:
       - msa-api
     healthcheck:
       test:
         - CMD-SHELL
         - curl --fail http://localhost:8080
-    image: openmsa/openmsa:sase-opslab-3.2.2-sha-c6e95880c59b6dd9b72468f8f6ee03f1d39147af
+    image: ubiqube/sase-opslab:sha-997f8e0dc9c88819dd423d51e1a8a91d43e5cee8