crowdsecurity · mmetc · Jun 3, 2025 · Jun 4, 2025
diff --git a/.github/workflows/docker-tests.yml b/.github/workflows/docker-tests.yml
@@ -41,7 +41,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: ./Dockerfile${{ matrix.flavor == 'debian' && '.debian' || '' }}
+          file: ./build/docker/Dockerfile${{ matrix.flavor == 'debian' && '.debian' || '' }}
           tags: crowdsecurity/crowdsec:test${{ matrix.flavor == 'full' && '' || '-' }}${{ matrix.flavor == 'full' && '' || matrix.flavor }}
           target: ${{ matrix.flavor == 'debian' && 'full' || matrix.flavor }}
           platforms: linux/amd64
@@ -57,17 +57,17 @@ jobs:
         with:
           version: 0.5.24
           enable-cache: true
-          cache-dependency-glob: "./docker/test/uv.lock"
+          cache-dependency-glob: "./build/docker/test/uv.lock"
 
       - name: "Set up Python"
         uses: actions/setup-python@v5
         with:
-          python-version-file: "./docker/test/.python-version"
+          python-version-file: "./build/docker/test/.python-version"
 
       # running serially to reduce test flakiness
       - name: Lint and run the tests
         run: |
-          cd docker/test
+          cd build/docker/test
           uv sync --all-extras --dev --locked
           uv run ruff check
           uv run basedpyright

diff --git a/.github/workflows/publish-docker-master.yml b/.github/workflows/publish-docker-master.yml
@@ -6,13 +6,13 @@ on:
     paths:
       - 'pkg/**'
       - 'cmd/**'
-      - 'mk/**'
-      - 'docker/docker_start.sh'
-      - 'docker/config.yaml'
+      - 'build/**'
+      - 'build/docker/Dockerfile'
+      - 'build/docker/Dockerfile.debian'
+      - 'build/docker/config.yaml'
+      - 'build/docker/docker_start.sh'
       - '.github/workflows/publish-docker-master.yml'
       - '.github/workflows/publish-docker.yml'
-      - 'Dockerfile'
-      - 'Dockerfile.debian'
       - 'go.mod'
       - 'go.sum'
       - 'Makefile'

diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml
@@ -96,7 +96,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: ./Dockerfile${{ inputs.debian && '.debian' || '' }}
+          file: ./build/docker/Dockerfile${{ inputs.debian && '.debian' || '' }}
           push: ${{ inputs.push }}
           tags: ${{ steps.slim.outputs.tags }}
           target: slim
@@ -112,7 +112,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: ./Dockerfile${{ inputs.debian && '.debian' || '' }}
+          file: ./build/docker/Dockerfile${{ inputs.debian && '.debian' || '' }}
           push: ${{ inputs.push }}
           tags: ${{ steps.full.outputs.tags }}
           target: full

diff --git a/.github/workflows/update_docker_hub_doc.yml b/.github/workflows/update_docker_hub_doc.yml
@@ -5,7 +5,7 @@ on:
     branches:
       - master
     paths:
-      - 'docker/README.md'
+      - 'build/docker/README.md'
 
 jobs:
   update-docker-hub-readme:
@@ -26,4 +26,4 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
           repository: crowdsecurity/crowdsec
           short-description: "Crowdsec - An open-source, lightweight agent to detect and respond to bad behaviours."
-          readme-filepath: "./docker/README.md"
+          readme-filepath: "./build/docker/README.md"
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
-include mk/platform.mk
-include mk/gmsl
+include build/mk/platform.mk
+include build/mk/gmsl
 
 # By default, this build requires the C++ re2 library to be installed.
 #
@@ -399,4 +399,4 @@ else
 include test/bats.mk
 endif
 
-include mk/help.mk
+include build/mk/help.mk
diff --git a/Dockerfile → build/docker/Dockerfile b/Dockerfile → build/docker/Dockerfile
@@ -40,8 +40,8 @@ RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/co
 
 COPY --from=build /go/bin/yq /usr/local/bin/crowdsec /usr/local/bin/cscli /usr/local/bin/
 COPY --from=build /etc/crowdsec /staging/etc/crowdsec
-COPY --from=build /go/src/crowdsec/docker/docker_start.sh /
-COPY --from=build /go/src/crowdsec/docker/config.yaml /staging/etc/crowdsec/config.yaml
+COPY --from=build /go/src/crowdsec/build/docker/docker_start.sh /
+COPY --from=build /go/src/crowdsec/build/docker/config.yaml /staging/etc/crowdsec/config.yaml
 COPY --from=build /var/lib/crowdsec /staging/var/lib/crowdsec
 RUN yq -n '.url="http://0.0.0.0:8080"' | install -m 0600 /dev/stdin /staging/etc/crowdsec/local_api_credentials.yaml
 

diff --git a/Dockerfile.debian → build/docker/Dockerfile.debian b/Dockerfile.debian → build/docker/Dockerfile.debian
@@ -56,8 +56,8 @@ RUN apt-get update && \
 
 COPY --from=build /go/bin/yq /usr/local/bin/crowdsec /usr/local/bin/cscli /usr/local/bin/
 COPY --from=build /etc/crowdsec /staging/etc/crowdsec
-COPY --from=build /go/src/crowdsec/docker/docker_start.sh /
-COPY --from=build /go/src/crowdsec/docker/config.yaml /staging/etc/crowdsec/config.yaml
+COPY --from=build /go/src/crowdsec/build/docker/docker_start.sh /
+COPY --from=build /go/src/crowdsec/build/docker/config.yaml /staging/etc/crowdsec/config.yaml
 RUN yq -n '.url="http://0.0.0.0:8080"' | install -m 0600 /dev/stdin /staging/etc/crowdsec/local_api_credentials.yaml && \
     yq eval -i ".plugin_config.group = \"nogroup\"" /staging/etc/crowdsec/config.yaml
 

diff --git a/docker/README.md → build/docker/README.md b/docker/README.md → build/docker/README.md
@@ -48,15 +48,15 @@ You can build your custom images with Dockerfile and Dockerfile-debian.
 For example, if you need a Debian version without plugin notifiers:
 
 ```console
-$ docker build -f Dockerfile.debian --target slim .
+$ docker build -f build/docker/Dockerfile.debian --target slim .
 ```
 
 The supported values for target are: full, geoip, plugins, slim.
 
 Note: for crowdsec versions < 1.5.0, the syntax is
 
 ```console
-$ docker build -f Dockerfile.debian --build-arg=BUILD_ENV=slim .
+$ docker build -f build/docker/Dockerfile.debian --build-arg=BUILD_ENV=slim .
 ```
 
 

diff --git a/docker/config.yaml → build/docker/config.yaml b/docker/config.yaml → build/docker/config.yaml
diff --git a/docker/docker_start.sh → build/docker/docker_start.sh b/docker/docker_start.sh → build/docker/docker_start.sh
diff --git a/docker/preload-hub-items → build/docker/preload-hub-items b/docker/preload-hub-items → build/docker/preload-hub-items
diff --git a/docker/test/.python-version → build/docker/test/.python-version b/docker/test/.python-version → build/docker/test/.python-version
diff --git a/docker/test/README.md → build/docker/test/README.md b/docker/test/README.md → build/docker/test/README.md
diff --git a/docker/test/default.env → build/docker/test/default.env b/docker/test/default.env → build/docker/test/default.env
diff --git a/docker/test/pyproject.toml → build/docker/test/pyproject.toml b/docker/test/pyproject.toml → build/docker/test/pyproject.toml
diff --git a/docker/test/pytest-debug.ini → build/docker/test/pytest-debug.ini b/docker/test/pytest-debug.ini → build/docker/test/pytest-debug.ini
diff --git a/docker/test/pytest.ini → build/docker/test/pytest.ini b/docker/test/pytest.ini → build/docker/test/pytest.ini
diff --git a/docker/test/tests/__init__.py → build/docker/test/tests/__init__.py b/docker/test/tests/__init__.py → build/docker/test/tests/__init__.py
diff --git a/docker/test/tests/conftest.py → build/docker/test/tests/conftest.py b/docker/test/tests/conftest.py → build/docker/test/tests/conftest.py
diff --git a/docker/test/tests/test_agent.py → build/docker/test/tests/test_agent.py b/docker/test/tests/test_agent.py → build/docker/test/tests/test_agent.py
diff --git a/docker/test/tests/test_agent_only.py → build/docker/test/tests/test_agent_only.py b/docker/test/tests/test_agent_only.py → build/docker/test/tests/test_agent_only.py
diff --git a/docker/test/tests/test_bouncer.py → build/docker/test/tests/test_bouncer.py b/docker/test/tests/test_bouncer.py → build/docker/test/tests/test_bouncer.py
diff --git a/docker/test/tests/test_capi.py → build/docker/test/tests/test_capi.py b/docker/test/tests/test_capi.py → build/docker/test/tests/test_capi.py
diff --git a/docker/test/tests/test_capi_whitelists.py → ...docker/test/tests/test_capi_whitelists.py b/docker/test/tests/test_capi_whitelists.py → ...docker/test/tests/test_capi_whitelists.py
diff --git a/docker/test/tests/test_cold_logs.py → build/docker/test/tests/test_cold_logs.py b/docker/test/tests/test_cold_logs.py → build/docker/test/tests/test_cold_logs.py
diff --git a/docker/test/tests/test_flavors.py → build/docker/test/tests/test_flavors.py b/docker/test/tests/test_flavors.py → build/docker/test/tests/test_flavors.py
diff --git a/docker/test/tests/test_hello.py → build/docker/test/tests/test_hello.py b/docker/test/tests/test_hello.py → build/docker/test/tests/test_hello.py
diff --git a/docker/test/tests/test_hub.py → build/docker/test/tests/test_hub.py b/docker/test/tests/test_hub.py → build/docker/test/tests/test_hub.py
diff --git a/docker/test/tests/test_hub_collections.py → ...docker/test/tests/test_hub_collections.py b/docker/test/tests/test_hub_collections.py → ...docker/test/tests/test_hub_collections.py
diff --git a/docker/test/tests/test_hub_parsers.py → build/docker/test/tests/test_hub_parsers.py b/docker/test/tests/test_hub_parsers.py → build/docker/test/tests/test_hub_parsers.py
diff --git a/docker/test/tests/test_hub_postoverflows.py → ...cker/test/tests/test_hub_postoverflows.py b/docker/test/tests/test_hub_postoverflows.py → ...cker/test/tests/test_hub_postoverflows.py
diff --git a/docker/test/tests/test_hub_scenarios.py → ...d/docker/test/tests/test_hub_scenarios.py b/docker/test/tests/test_hub_scenarios.py → ...d/docker/test/tests/test_hub_scenarios.py
diff --git a/docker/test/tests/test_local_api_url.py → ...d/docker/test/tests/test_local_api_url.py b/docker/test/tests/test_local_api_url.py → ...d/docker/test/tests/test_local_api_url.py
diff --git a/docker/test/tests/test_local_item.py → build/docker/test/tests/test_local_item.py b/docker/test/tests/test_local_item.py → build/docker/test/tests/test_local_item.py
diff --git a/docker/test/tests/test_metrics.py → build/docker/test/tests/test_metrics.py b/docker/test/tests/test_metrics.py → build/docker/test/tests/test_metrics.py
diff --git a/docker/test/tests/test_nolapi.py → build/docker/test/tests/test_nolapi.py b/docker/test/tests/test_nolapi.py → build/docker/test/tests/test_nolapi.py
diff --git a/docker/test/tests/test_simple.py → build/docker/test/tests/test_simple.py b/docker/test/tests/test_simple.py → build/docker/test/tests/test_simple.py
diff --git a/docker/test/tests/test_tls.py → build/docker/test/tests/test_tls.py b/docker/test/tests/test_tls.py → build/docker/test/tests/test_tls.py
diff --git a/docker/test/tests/test_version.py → build/docker/test/tests/test_version.py b/docker/test/tests/test_version.py → build/docker/test/tests/test_version.py
diff --git a/docker/test/tests/test_wal.py → build/docker/test/tests/test_wal.py b/docker/test/tests/test_wal.py → build/docker/test/tests/test_wal.py
diff --git a/docker/test/uv.lock → build/docker/test/uv.lock b/docker/test/uv.lock → build/docker/test/uv.lock
diff --git a/mk/__gmsl → build/mk/__gmsl b/mk/__gmsl → build/mk/__gmsl
diff --git a/mk/gmsl → build/mk/gmsl b/mk/gmsl → build/mk/gmsl
diff --git a/mk/gmsl.html → build/mk/gmsl.html b/mk/gmsl.html → build/mk/gmsl.html
diff --git a/mk/help.mk → build/mk/help.mk b/mk/help.mk → build/mk/help.mk
diff --git a/mk/platform.mk → build/mk/platform.mk b/mk/platform.mk → build/mk/platform.mk
@@ -10,11 +10,11 @@ ifeq ($(OS), Windows_NT)
 	EXT = .exe
 else
 	SYSTEM ?= $(shell uname -s | tr '[A-Z]' '[a-z]')
-	include mk/platform/unix_common.mk
+	include build/mk/platform/unix_common.mk
 endif
 
-ifneq ("$(wildcard mk/platform/$(SYSTEM).mk)", "")
-	include mk/platform/$(SYSTEM).mk
+ifneq ("$(wildcard build/mk/platform/$(SYSTEM).mk)", "")
+	include build/mk/platform/$(SYSTEM).mk
 else
-	include mk/platform/linux.mk
+	include build/mk/platform/linux.mk
 endif
diff --git a/mk/platform/freebsd.mk → build/mk/platform/freebsd.mk b/mk/platform/freebsd.mk → build/mk/platform/freebsd.mk
diff --git a/mk/platform/linux.mk → build/mk/platform/linux.mk b/mk/platform/linux.mk → build/mk/platform/linux.mk
diff --git a/mk/platform/openbsd.mk → build/mk/platform/openbsd.mk b/mk/platform/openbsd.mk → build/mk/platform/openbsd.mk
diff --git a/mk/platform/unix_common.mk → build/mk/platform/unix_common.mk b/mk/platform/unix_common.mk → build/mk/platform/unix_common.mk
diff --git a/mk/platform/windows.mk → build/mk/platform/windows.mk b/mk/platform/windows.mk → build/mk/platform/windows.mk