From 27cf60dcb88bbf601334fb00e047d387453025d6 Mon Sep 17 00:00:00 2001 From: Owen Date: Thu, 27 Feb 2025 10:57:37 -0500 Subject: [PATCH 1/3] Fix cicd with go-build-release installer --- .github/workflows/cicd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index be0fc303..bc581582 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -64,7 +64,7 @@ jobs: - name: Build installer working-directory: install run: | - make release + make go-build-release - name: Upload artifacts from /install/bin uses: actions/upload-artifact@v4 From c66efb3c14eff95b7a7f5a21d0803db44e67486a Mon Sep 17 00:00:00 2001 From: Owen Date: Sun, 2 Mar 2025 21:47:32 -0500 Subject: [PATCH 2/3] Remove gerbil depenency and exposed port 9090 --- install/config/crowdsec/docker-compose.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/install/config/crowdsec/docker-compose.yml b/install/config/crowdsec/docker-compose.yml index 982b3335..6ade6111 100644 --- a/install/config/crowdsec/docker-compose.yml +++ b/install/config/crowdsec/docker-compose.yml @@ -11,8 +11,6 @@ services: ENROLL_TAGS: docker healthcheck: test: ["CMD", "cscli", "capi", "status"] - depends_on: - - gerbil # Wait for gerbil to be healthy labels: - "traefik.enable=false" # Disable traefik for crowdsec volumes: @@ -25,10 +23,8 @@ services: - ./config/crowdsec_logs:/var/log # crowdsec logs - ./config/traefik/logs:/var/log/traefik # traefik logs ports: - - 9090:9090 # port mapping for local firewall bouncers - 6060:6060 # metrics endpoint for prometheus expose: - - 9090 # http api for bouncers - 6060 # metrics endpoint for prometheus - 7422 # appsec waf endpoint restart: unless-stopped From 6a60122e5c9aa3fedd8e84ad0bbbda7549b1070d Mon Sep 17 00:00:00 2001 From: Owen Date: Sun, 2 Mar 2025 21:49:15 -0500 Subject: [PATCH 3/3] Remove prom exposed port and waf port Resolves #247 --- install/config/crowdsec/docker-compose.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/install/config/crowdsec/docker-compose.yml b/install/config/crowdsec/docker-compose.yml index 6ade6111..d03861d4 100644 --- a/install/config/crowdsec/docker-compose.yml +++ b/install/config/crowdsec/docker-compose.yml @@ -22,10 +22,5 @@ services: - ./config/crowdsec_logs/syslog:/var/log/syslog:ro # syslog - ./config/crowdsec_logs:/var/log # crowdsec logs - ./config/traefik/logs:/var/log/traefik # traefik logs - ports: - - 6060:6060 # metrics endpoint for prometheus - expose: - - 6060 # metrics endpoint for prometheus - - 7422 # appsec waf endpoint restart: unless-stopped command: -t # Add test config flag to verify configuration \ No newline at end of file