Renames the Docker images

Signed-off-by: iosifache <[email protected]>

.github/workflows/ghcr-publish.yml

@@ -1,8 +1,6 @@
-# See also the link below:
-# https://docs.github.com/en/actions/publishing-packages/publishing-docker-images
-
-name: Create and publish a Docker images to GHCR
+# Relevant docs: https://docs.github.com/en/actions/publishing-packages/publishing-docker-images
 
+name: Create and publish Docker images to GHCR
 on:
   push:
     branches:
@@ -11,10 +9,8 @@ on:
       - sandcastle
       - tooling
       - .github/workflows/ghcr-publish.yml
-
 env:
   REGISTRY: ghcr.io
-
 jobs:
   build-and-push-image:
     runs-on: ubuntu-latest
@@ -23,30 +19,30 @@ jobs:
         include:
           - id: sandcastle
             context: sandcastle
-          - id: coder_sarif
+          - id: coder
             context: tooling/coder
-          - id: static_analysis
+          - id: static-analysis
             context: tooling/static-analysers
           - id: afplusplus
             context: tooling/aflplusplus
     permissions:
       contents: read
       packages: write
     steps:
-      - name: Checkout repository
+      - name: Checkout the repository
         uses: actions/checkout@v4
       - name: Log in to the Container registry
         uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Extract metadata (tags, labels) for Docker
+      - name: Extract the tag and labels for the Docker image
         id: meta
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
-          images: ${{ env.REGISTRY }}/${{ github.repository }}_${{ matrix.id }}
-      - name: Build and push Docker image
+          images: ${{ env.REGISTRY }}/${{ matrix.id }}
+      - name: Build and push the Docker image
         uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
         with:
           context: ${{ matrix.context }}

docker-compose.yaml

@@ -1,12 +1,12 @@
 version: "2.4"
 services:
   sandcastle:
-    image: ghcr.io/iosifache/oss_fortress_sandcastle:main
+    image: ghcr.io/iosifache/sandcastle:main
     build:
       context: sandcastle
       network: host
       tags:
-        - "oss_fortress_sandcastle:latest"
+        - "sandcastle:latest"
     container_name: sandcastle
     ports:
       - "8000:8080"
@@ -39,11 +39,11 @@ services:
       - all
 
   coder:
-    image: ghcr.io/iosifache/oss_fortress_coder:main
+    image: ghcr.io/iosifache/coder:main
     build:
       context: tooling/coder
       tags:
-        - "oss_fortress_coder:latest"
+        - "coder:latest"
     container_name: coder
     volumes:
       - ".:/home/coder/codebase:ro"
@@ -58,12 +58,12 @@ services:
       - all
 
   static-analysers:
-    image: ghcr.io/iosifache/oss_fortress_static_analysers:main
+    image: ghcr.io/iosifache/static-analysers:main
     build:
       context: tooling/static-analysers
       network: host
       tags:
-        - "static_analysers:latest"
+        - "static-analysers:latest"
     container_name: static-analysers
     volumes:
       - ".:/root/codebase:ro"
@@ -77,7 +77,7 @@ services:
       - all
 
   aflplusplus:
-    image: ghcr.io/iosifache/oss_fortress_aflplusplus:main
+    image: ghcr.io/iosifache/aflplusplus:main
     build:
       context: tooling/aflplusplus
       network: host

wiki/docs/Analysis environment.md

@@ -27,7 +27,7 @@ For the analysed application and the above tooling, the workshop provides a Dock
     - `sandcastle`
     - `all`
 - **`Dockerfile` in the `oss-fortress` repository**: `sandcastle/Dockerfile`
-- **Hosted image**: `iosifache/oss_fortress_sandcastle:main` in GitHub Container Registry
+- **Hosted image**: `iosifache/sandcastle:main` in GitHub Container Registry
 - **Exposed ports**: `8000` for the web UI
 - **User**: `root`
 - **Credentials**: N/A
@@ -55,7 +55,7 @@ For the analysed application and the above tooling, the workshop provides a Dock
     - `threat-modelling`
     - `all`
 - **`Dockerfile` in the `oss-fortress` repository**: `tooling/coder/Dockerfile`
-- **Hosted image**: `iosifache/oss_fortress_coder:main` in GitHub Container Registry
+- **Hosted image**: `iosifache/coder:main` in GitHub Container Registry
 - **Exposed ports**: `8002` for the web UI
 - **User**: `coder`
 - **Credentials**: `oss-fortress` as the password for authenticating in the user interface
@@ -71,7 +71,7 @@ For the analysed application and the above tooling, the workshop provides a Dock
     - `static-analysis`
     - `all`
 - **`Dockerfile` in the `oss-fortress` repository**: `tooling/static-analysers/Dockerfile`
-- **Hosted image**: `iosifache/oss_fortress_static_analysers:main` in GitHub Container Registry
+- **Hosted image**: `iosifache/static-analysers:main` in GitHub Container Registry
 - **Exposed ports**: N/A
 - **User**: `root`
 - **Credentials**: N/A
@@ -87,7 +87,7 @@ For the analysed application and the above tooling, the workshop provides a Dock
     - `dynamic-analysis`
     - `all`
 - **`Dockerfile` in the `oss-fortress` repository**: `tooling/aflplusplus/Dockerfile`
-- **Hosted image**: `iosifache/oss_fortress_aflplusplus:main` in GitHub Container Registry
+- **Hosted image**: `iosifache/aflplusplus:main` in GitHub Container Registry
 - **Exposed ports**: N/A
 - **User**: `root`
 - **Credentials**: N/A