From 3c96d379181a162eebe77474776db7fef22a4bc9 Mon Sep 17 00:00:00 2001 From: U039b Date: Fri, 19 Apr 2024 08:48:00 +0200 Subject: [PATCH] Fix wrong Dockerfile paths and deleted the full.yml definition --- deploy_package/full.yml | 194 -------------------------------------- deploy_package/no-sso.yml | 6 +- 2 files changed, 3 insertions(+), 197 deletions(-) delete mode 100644 deploy_package/full.yml diff --git a/deploy_package/full.yml b/deploy_package/full.yml deleted file mode 100644 index a204e1c..0000000 --- a/deploy_package/full.yml +++ /dev/null @@ -1,194 +0,0 @@ -version: '3' - -volumes: - production_traefik: {} - production_colander_postgres_data: {} - production_colander_postgres_data_backups: {} - production_threatr_postgres_data: {} - production_threatr_postgres_data_backups: {} - production_keycloak_postgres_data: {} - production_keycloak_postgres_data_backups: {} - production_colander_minio_data: { } - production_colander_es_data: { } - -services: - # Databases - colander-postgres: - build: - context: . - dockerfile: ./compose/production/postgres/Dockerfile - image: colander_production_postgres - volumes: - - production_colander_postgres_data:/var/lib/postgresql/data:Z - - production_colander_postgres_data_backups:/backups:z - env_file: - - .envs/.production/.colander-postgres - - threatr-postgres: - build: - context: . - dockerfile: ./compose/production/postgres/Dockerfile - image: colander_production_threatr_postgres - volumes: - - production_threatr_postgres_data:/var/lib/postgresql/data:Z - - production_threatr_postgres_data_backups:/backups:z - env_file: - - .envs/.production/.threatr-postgres - - keycloak-postgres: - build: - context: . - dockerfile: ./compose/production/postgres/Dockerfile - image: colander_production_keycloak_postgres - volumes: - - production_keycloak_postgres_data:/var/lib/postgresql/data:Z - - production_keycloak_postgres_data_backups:/backups:z - env_file: - - .envs/.production/.keycloak-postgres - - colander-front: - image: ghcr.io/piroguetoolsuite/colander:main - depends_on: - - colander-postgres - - cyberchef - - elasticsearch - - keycloak - - playwright - - minio - - redis - env_file: - - .envs/.production/.base - - .envs/.production/.minio - - .envs/.production/.colander - - .envs/.production/.colander-postgres - command: /start - labels: - - "com.centurylinklabs.watchtower.enable=true" - - colander-worker: - image: ghcr.io/piroguetoolsuite/colander:main - depends_on: - - colander-postgres - - elasticsearch - - playwright - - minio - - redis - env_file: - - .envs/.production/.base - - .envs/.production/.minio - - .envs/.production/.colander - - .envs/.production/.colander-postgres - command: /start-worker - labels: - - "com.centurylinklabs.watchtower.enable=true" - - threatr-front: - image: ghcr.io/piroguetoolsuite/threatr:main - depends_on: - - threatr-postgres - - elasticsearch - - redis - env_file: - - .envs/.production/.base - - .envs/.production/.threatr - - .envs/.production/.threatr-postgres - command: /start - labels: - - "com.centurylinklabs.watchtower.enable=true" - - threatr-worker: - image: ghcr.io/piroguetoolsuite/threatr:main - depends_on: - - threatr-postgres - - elasticsearch - - redis - env_file: - - .envs/.production/.base - - .envs/.production/.threatr - - .envs/.production/.threatr-postgres - command: /start-worker - labels: - - "com.centurylinklabs.watchtower.enable=true" - - traefik: - build: - context: . - dockerfile: ./compose/production/traefik/Dockerfile - image: colander_production_traefik - depends_on: - - colander-front - - threatr-front - - cyberchef - - keycloak - volumes: - - production_traefik:/etc/traefik/acme:z - ports: - - "0.0.0.0:80:80" - - "0.0.0.0:443:443" - - cyberchef: - image: mpepping/cyberchef:latest - restart: unless-stopped - labels: - - "com.centurylinklabs.watchtower.enable=false" - - playwright: - image: ghcr.io/piroguetoolsuite/playwright-rest-api:main - container_name: colander_production_playwright - restart: unless-stopped - labels: - - "com.centurylinklabs.watchtower.enable=true" - - elasticsearch: - image: elasticsearch:8.4.1 - volumes: - - production_colander_es_data:/usr/share/elasticsearch/data - environment: - - discovery.type='single-node' - - xpack.security.enabled='false' - - "ES_JAVA_OPTS=-Xms2048m -Xmx2048m" - - minio: - image: quay.io/minio/minio:RELEASE.2022-09-22T18-57-27Z - volumes: - - production_colander_minio_data:/data - env_file: - - .envs/.production/.minio - command: server /data - healthcheck: - test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/live" ] - interval: 30s - timeout: 20s - retries: 3 - - keycloak: -# https://hub.docker.com/r/bitnami/keycloak - image: bitnami/keycloak:20.0.5 - env_file: - - .envs/.production/.base - - .envs/.production/.keycloak - - .envs/.production/.keycloak-postgres - healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8080/"] - interval: 10s - timeout: 5s - retries: 3 - depends_on: - - keycloak-db - - watchtower: - image: containrrr/watchtower - restart: always - volumes: - - /var/run/docker.sock:/var/run/docker.sock - - /etc/timezone:/etc/timezone:ro - environment: - - WATCHTOWER_CLEANUP=true - - WATCHTOWER_LABEL_ENABLE=true - - WATCHTOWER_INCLUDE_RESTARTING=true - - WATCHTOWER_POLL_INTERVAL=3600 - labels: - - "com.centurylinklabs.watchtower.enable=true" - - redis: - image: redis:6 diff --git a/deploy_package/no-sso.yml b/deploy_package/no-sso.yml index 68458b7..9015650 100644 --- a/deploy_package/no-sso.yml +++ b/deploy_package/no-sso.yml @@ -14,7 +14,7 @@ services: colander-postgres: build: context: . - dockerfile: ./compose/postgres/Dockerfile + dockerfile: ./compose/production/postgres/Dockerfile image: colander_production_postgres restart: unless-stopped volumes: @@ -26,7 +26,7 @@ services: threatr-postgres: build: context: . - dockerfile: ./compose/postgres/Dockerfile + dockerfile: ./compose/production/postgres/Dockerfile image: colander_production_threatr_postgres restart: unless-stopped volumes: @@ -105,7 +105,7 @@ services: traefik: build: context: . - dockerfile: ./compose/traefik/Dockerfile + dockerfile: ./compose/production/traefik/Dockerfile image: colander_production_traefik restart: unless-stopped depends_on: