clean and remove old stuff not used

Signed-off-by: Giuseppe Baccini <giuseppe.baccini@logobject.ch>

.github/workflows/build-builder.yaml

@@ -30,7 +30,7 @@ jobs:
       - name: Build and push builder-image
         uses: docker/build-push-action@v3
         with:
-          file: 'scripts/Dockerfile-ubuntu.builder'
+          file: 'scripts/Dockerfile.ubuntu.builder'
           context: scripts
           push: true
           tags: ghcr.io/${{ github.actor }}/${{ env.IMAGE_NAME_BUILDER }}:latest

.github/workflows/build-chatterbox.yaml

@@ -20,8 +20,7 @@ on:
         type: string
 
 env:
-  IMAGE_NAME_BUILDER: chatterbox-builder
-  IMAGE_NAME_CHATTERBOX: chatterbox
+  IMAGE_NAME_BUILDER: chatterbox-ubuntu-builder
   IMAGE_NAME_CHATTERBOX_TEST: chatterbox-test
 
 jobs:
@@ -54,10 +53,10 @@ jobs:
       - name: Build chatterbox-test binary
         run: |
           docker run \
-            -e BASE_DIR=/project \
+            -e BASE_DIR=/project/chatterbox \
             -e NINJA_JOBS=6 \
-            -e CONTRIB_PATH=/contrib \
-            -v $GITHUB_WORKSPACE:/project \
+            -e CONTRIB_PATH=/project/contrib \
+            -v $GITHUB_WORKSPACE:/project/chatterbox \
             ghcr.io/${{ github.actor }}/${{ env.IMAGE_NAME_BUILDER }}:${{ steps.tag.outputs.tag }} build-test
 
       - name: Copy scenarios
@@ -76,7 +75,7 @@ jobs:
         run: |
           docker run ${{ env.IMAGE_NAME_CHATTERBOX_TEST }}:${{ steps.tag.outputs.tag }}
 
-  build-and-push-chatterbox:
+  build-chatterbox:
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -105,17 +104,8 @@ jobs:
       - name: Build chatterbox binary
         run: |
           docker run \
-            -e BASE_DIR=/project \
+            -e BASE_DIR=/project/chatterbox \
             -e NINJA_JOBS=6 \
-            -e CONTRIB_PATH=/contrib \
-            -v $GITHUB_WORKSPACE:/project \
+            -e CONTRIB_PATH=/project/contrib \
+            -v $GITHUB_WORKSPACE:/project/chatterbox \
             ghcr.io/${{ github.actor }}/${{ env.IMAGE_NAME_BUILDER }}:${{ steps.tag.outputs.tag }} build
-
-      - name: Build and push chatterbox-image
-        uses: docker/build-push-action@v3
-        with:
-          file: 'scripts/Dockerfile.chatterbox'
-          context: build/cbox
-          push: true
-          tags: ghcr.io/${{ github.actor }}/${{ env.IMAGE_NAME_CHATTERBOX }}:${{ steps.tag.outputs.tag }}
-          labels: ${{ env.IMAGE_NAME_CHATTERBOX }}

docs/build.md

@@ -12,7 +12,7 @@ Currently, `chatterbox` can be solely built under Linux.
 If you wish to build the `chatterbox` binary directly on your Linux
 distribution, ensure your system provides all the required dependencies.
 You can figure out what are the needed packages for your system by inspecting the
-[builder Dockerfile](../scripts/Dockerfile-leap.builder) for OpenSuse Tumbleweed.
+available builder Dockerfile(s).
 
 ## How to build
 
@@ -34,8 +34,8 @@ cd scripts
 It is possible to use a Docker builder image to compile the binary
 of `chatterbox`.
 
-- `scripts/Dockerfile-leap.builder`
-- `scripts/Dockerfile-ubuntu.builder`
+- `scripts/Dockerfile.leap.builder`
+- `scripts/Dockerfile.ubuntu.builder`
 
 To build `chatterbox` with the Docker builder image, your system needs
 to provide Docker.