docker: move Docker-related files to docker/

.env

@@ -1,7 +1,7 @@
 COMPOSE_PROJECT_NAME=akvorado
-COMPOSE_FILE=docker-compose.yml:docker-compose-ipinfo.yml:docker-compose-demo.yml
+COMPOSE_FILE=docker/docker-compose.yml:docker/docker-compose-ipinfo.yml:docker/docker-compose-demo.yml
 
 # When using MaxmindDB:
-# COMPOSE_FILE=docker-compose.yml:docker-compose-maxmind.yml:docker-compose-demo.yml
+# COMPOSE_FILE=docker/docker-compose.yml:docker/docker-compose-maxmind.yml:docker/docker-compose-demo.yml
 # GEOIPUPDATE_ACCOUNT_ID=...
 # GEOIPUPDATE_LICENSE_KEY=...

.github/workflows/ci.yml

@@ -226,7 +226,7 @@ jobs:
       - uses: docker/build-push-action@v4
         with:
           context: .
-          file: Dockerfile
+          file: docker/Dockerfile
           platforms: ${{ startsWith(github.ref, 'refs/tags/') && 'linux/amd64,linux/arm64' || 'linux/amd64' }}
           push: true
           tags: ${{ steps.meta.outputs.tags }}
@@ -262,9 +262,9 @@ jobs:
       # Build tarball for docker compose
       - name: Build docker-compose "quick start"
         run: |
-          sed -i s,akvorado:latest,akvorado:${GITHUB_REF_NAME#v}, docker-compose*.yml
+          sed -i s,akvorado:latest,akvorado:${GITHUB_REF_NAME#v}, docker/docker-compose*.yml
           tar zcvf docker-compose-quickstart.tar.gz \
-            docker-compose.yml docker-compose-demo.yml .env \
+            .env docker/* \
             orchestrator/clickhouse/data/docker-entrypoint.sh \
             config/*.yaml
 

.gitlab-ci.yml

@@ -89,5 +89,5 @@ build docker image:
       EOF
     - docker info
     - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - docker build -t $CI_REGISTRY_IMAGE:$CI_COMMIT_BRANCH$CI_MERGE_REQUEST_ID .
+    - docker build -f docker/Dockerfile -t $CI_REGISTRY_IMAGE:$CI_COMMIT_BRANCH$CI_MERGE_REQUEST_ID .
     - docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_BRANCH$CI_MERGE_REQUEST_ID

console/data/docs/01-install.md

@@ -22,8 +22,8 @@ using containers. If you want to use `docker compose`, have a look at the [quick
 start procedure](00-intro.md#quick-start). This documentation assumes you are
 running the `docker compose` setup.
 
-If you want to compile the Docker image yourself, you can use `docker build -t
-akvorado:latest .`. Then, in `docker-compose.yml`, replace
+If you want to compile the Docker image yourself, you can use `docker build -f
+docker/Dockerfile -t akvorado:latest .`. Then, in `docker-compose.yml`, replace
 `ghcr.io/akvorado/akvorado:latest` by `akvorado:latest`.
 
 ## Pre-built binary

console/data/docs/99-changelog.md

@@ -41,6 +41,7 @@ identified with a specific icon:
   `allow_suspicious_low_cardinality_types` to ensure we can use
   `LowCardinality(IPv6)`.
 - 🌱 *build*: minimum supported Node version is now 16
+- 🌱 *docker*: move Docker-related files to `docker/`
 - 🌱 *docker*: update ClickHouse to 23.3 (not mandatory)
 - 🌱 *docker*: update to Zookeeper 3.8 (not mandatory)
 - 🌱 *docker*: update to Kafka 3.5 (not mandatory, but there is also a configuration change)

docker/docker-compose.yml

@@ -77,7 +77,7 @@ services:
     restart: unless-stopped
     command: orchestrator /etc/akvorado/akvorado.yaml
     volumes:
-      - ./config:/etc/akvorado:ro
+      - ../config:/etc/akvorado:ro
     labels:
       - traefik.enable=true
       - traefik.http.routers.akvorado-orchestrator.entrypoints=private # it exposes configuration files with passwords
@@ -133,7 +133,7 @@ services:
   clickhouse:
     image: clickhouse/clickhouse-server:23.3
     volumes:
-      - ./orchestrator/clickhouse/data/docker-entrypoint.sh:/docker-entrypoint-initdb.d/init-db.sh:ro
+      - ../orchestrator/clickhouse/data/docker-entrypoint.sh:/docker-entrypoint-initdb.d/init-db.sh:ro
       - akvorado-clickhouse:/var/lib/clickhouse
     environment:
       - CLICKHOUSE_INIT_TIMEOUT=60