diff --git a/.github/workflows/container-scan.yml b/.github/workflows/container-scan.yml index b99118da470..8f85be5767b 100644 --- a/.github/workflows/container-scan.yml +++ b/.github/workflows/container-scan.yml @@ -198,7 +198,7 @@ jobs: python3 -m pip install ./packages/syft python3 -m pip install cyclonedx-bom python3 -m pip freeze > requirements.txt - cyclonedx-py --r -i requirements.txt --format json -o syft.sbom.json + cyclonedx-py requirements -o syft.sbom.json #Trivy scan SBOM - name: Run Trivy vulnerability scanner diff --git a/packages/grid/docker-compose.build.yml b/packages/grid/docker-compose.build.yml index 2bc853212ab..5e87adfd1f4 100644 --- a/packages/grid/docker-compose.build.yml +++ b/packages/grid/docker-compose.build.yml @@ -5,16 +5,12 @@ services: context: ${RELATIVE_PATH}./frontend dockerfile: frontend.dockerfile target: "${FRONTEND_TARGET:-grid-ui-development}" - profiles: - - frontend backend: build: context: ${RELATIVE_PATH}../ dockerfile: ./grid/backend/backend.dockerfile target: "backend" - profiles: - - backend seaweedfs: build: @@ -22,13 +18,9 @@ services: dockerfile: seaweedfs.dockerfile args: - SEAWEEDFS_VERSION=${SEAWEEDFS_VERSION} - profiles: - - blob-storage worker: build: context: ${RELATIVE_PATH}../ dockerfile: ./grid/backend/backend.dockerfile target: "backend" - profiles: - - worker diff --git a/packages/grid/docker-compose.dev.yml b/packages/grid/docker-compose.dev.yml index b5b41eedfd2..d2b1f142053 100644 --- a/packages/grid/docker-compose.dev.yml +++ b/packages/grid/docker-compose.dev.yml @@ -1,19 +1,13 @@ version: "3.8" services: proxy: - profiles: - - proxy ports: - "8080" - extra_hosts: - - host.docker.internal:host-gateway command: - "--api" # admin panel - "--api.insecure=true" # admin panel no password frontend: - profiles: - - frontend volumes: - ${RELATIVE_PATH}./frontend/src:/app/src - ${RELATIVE_PATH}./frontend/static:/app/static @@ -34,14 +28,10 @@ services: # # - "5672" # AMQP port mongo: - profiles: - - mongo ports: - "27017" backend: - profiles: - - backend volumes: - ${RELATIVE_PATH}./backend/grid:/root/app/grid - ${RELATIVE_PATH}../syft:/root/app/syft @@ -52,8 +42,6 @@ services: tty: true worker: - profiles: - - worker volumes: - ${RELATIVE_PATH}./backend/grid:/root/app/grid - ${RELATIVE_PATH}../syft:/root/app/syft @@ -81,8 +69,6 @@ services: # - DEV_MODE=True seaweedfs: - profiles: - - blob-storage volumes: - ./data/seaweedfs:/data ports: diff --git a/packages/grid/docker-compose.pull.yml b/packages/grid/docker-compose.pull.yml index c556030d85d..db2329b04df 100644 --- a/packages/grid/docker-compose.pull.yml +++ b/packages/grid/docker-compose.pull.yml @@ -8,29 +8,19 @@ services: seaweedfs: image: "${DOCKER_IMAGE_SEAWEEDFS?Variable not set}:${VERSION-latest}" - profiles: - - blob-storage # docker-host: # image: qoomon/docker-host proxy: image: ${DOCKER_IMAGE_TRAEFIK?Variable not set}:${TRAEFIK_VERSION?Variable not set} - profiles: - - proxy mongo: image: "${MONGO_IMAGE}:${MONGO_VERSION}" - profiles: - - mongo jaeger: image: jaegertracing/all-in-one:1.37 - profiles: - - telemetry # Temporary fix until we refactor pull, build, launch UI step during hagrid launch worker: image: "${DOCKER_IMAGE_BACKEND?Variable not set}:${VERSION-latest}" - profiles: - - worker diff --git a/packages/grid/docker-compose.test.yml b/packages/grid/docker-compose.test.yml index fe1a3d71bbc..a9e323831bb 100644 --- a/packages/grid/docker-compose.test.yml +++ b/packages/grid/docker-compose.test.yml @@ -1,12 +1,8 @@ version: "3.8" services: proxy: - profiles: - - proxy ports: - "8080" - extra_hosts: - - host.docker.internal:host-gateway # redis: # ports: @@ -19,22 +15,16 @@ services: # - "15672" seaweedfs: - profiles: - - blob-storage ports: - "9333" # admin - "8888" # filer - "8333" # S3 backend: - profiles: - - backend environment: - TEST_MODE=1 worker: - profiles: - - worker environment: - TEST_MODE=1 diff --git a/packages/grid/docker-compose.tls.yml b/packages/grid/docker-compose.tls.yml index 010967b4561..6bfa5d7d1d7 100644 --- a/packages/grid/docker-compose.tls.yml +++ b/packages/grid/docker-compose.tls.yml @@ -1,8 +1,6 @@ version: "3.8" services: proxy: - profiles: - - proxy ports: - "${HTTPS_PORT}:${HTTPS_PORT}" environment: