From b31d9d12fa206316f74813c87ac987e3babe34d2 Mon Sep 17 00:00:00 2001
From: Andreas Heinrich <andreas.heinrich@rwth-aachen.de>
Date: Tue, 9 Jul 2024 06:47:19 +0200
Subject: [PATCH] rename build-kit to build-kit-base

Signed-off-by: Andreas Heinrich <andreas.heinrich@rwth-aachen.de>
---
 .github/workflows/deploy-build-kit.yaml       | 44 -------------------
 .github/workflows/deploy-docker-images.yml    |  6 +--
 README.md                                     |  6 +--
 .../.dockerignore                             |  0
 .../{build-kit => build-kit-base}/Dockerfile  |  0
 .../entrypoint.sh                             |  0
 .../maven-settings.xml                        |  0
 7 files changed, 6 insertions(+), 50 deletions(-)
 delete mode 100644 .github/workflows/deploy-build-kit.yaml
 rename docker/images/{build-kit => build-kit-base}/.dockerignore (100%)
 rename docker/images/{build-kit => build-kit-base}/Dockerfile (100%)
 rename docker/images/{build-kit => build-kit-base}/entrypoint.sh (100%)
 rename docker/images/{build-kit => build-kit-base}/maven-settings.xml (100%)

diff --git a/.github/workflows/deploy-build-kit.yaml b/.github/workflows/deploy-build-kit.yaml
deleted file mode 100644
index 57c86ba..0000000
--- a/.github/workflows/deploy-build-kit.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-name: Deploy build-kit docker image
-
-on:
-  workflow_dispatch:
-    inputs:
-      base-system:
-        type: choice
-        description: Base system type
-        default: 'alpine'
-        required: true
-        options:
-          - alpine
-          - debian
-      tag:
-        type: string
-        description: Image tag
-        default: 'latest'
-
-jobs:
-  deploy-build-kit-image:
-    name: Build and push build-kit docker image
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup docker buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to ghcr.io
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v4
-        with:
-          context: docker/images/build-kit
-          file: docker/images/build-kit/${{ inputs.base-system }}.Dockerfile
-          tags: ghcr.io/everest/build-kit-${{ inputs.base-system }}:${{ inputs.tag }}
-          push: true
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
diff --git a/.github/workflows/deploy-docker-images.yml b/.github/workflows/deploy-docker-images.yml
index 4d2efe5..a93c642 100644
--- a/.github/workflows/deploy-docker-images.yml
+++ b/.github/workflows/deploy-docker-images.yml
@@ -133,7 +133,7 @@ jobs:
         ${{ needs.env-setup.outputs.path_to_deploy_docker_images_workflow }}
       build_args: |
         BASE_IMAGE_TAG=${{ needs.build-env-base.outputs.one_image_tag }}
-  build-kit:
+  build-kit-base:
     needs:
       - env-setup
       - build-env-base
@@ -144,8 +144,8 @@ jobs:
       SA_GITHUB_USERNAME: ${{ secrets.SA_GITHUB_USERNAME }}
     with:
       force_rebuild: ${{ needs.env-setup.outputs.force_rebuild == 'true' || needs.build-env-base.outputs.rebuild == 'true' }}
-      image_name: ${{ needs.env-setup.outputs.repository_name }}/build-kit
-      directory: ${{ needs.env-setup.outputs.docker_directory }}/build-kit
+      image_name: ${{ needs.env-setup.outputs.repository_name }}/build-kit-base
+      directory: ${{ needs.env-setup.outputs.docker_directory }}/build-kit-base
       docker_registry: ${{ needs.env-setup.outputs.docker_registry }}
       github_ref_before: ${{ github.event.before }}
       github_ref_after: ${{ github.event.after }}
diff --git a/README.md b/README.md
index 02b3421..0aec86c 100644
--- a/README.md
+++ b/README.md
@@ -41,16 +41,16 @@ Deployed as `ghcr.io/everest/everest-ci/everest-clang-format`.
 Contains a fixed clang-format version in addition to a run-clang-format script. This image can be diretcly executed.
 This image is used as base for a custom github action and can also be used to run clang-format locally.
 
-### build-kit
+### build-kit-base
 
 > [!NOTE]
 > The images `ghcr.io/everest/build-kit-alpine` and `ghcr.io/everest/build-kit-debian`
 > are deprecated and will be removed in the future. Please use
-> `ghcr.io/everest/everest-ci/> build-kit` instead.
+> `ghcr.io/everest/everest-ci/build-kit-base` instead.
 
 Based on `build-env-base`.
 
-Deployed as `ghcr.io/everest/everest-ci/build-kit`.
+Deployed as `ghcr.io/everest/everest-ci/build-kit-base`.
 
 This image includes a mechanic to run bash scripts in the build environment. It is used to run the build scripts in the CI/CD pipeline.
 It is executed directly.
diff --git a/docker/images/build-kit/.dockerignore b/docker/images/build-kit-base/.dockerignore
similarity index 100%
rename from docker/images/build-kit/.dockerignore
rename to docker/images/build-kit-base/.dockerignore
diff --git a/docker/images/build-kit/Dockerfile b/docker/images/build-kit-base/Dockerfile
similarity index 100%
rename from docker/images/build-kit/Dockerfile
rename to docker/images/build-kit-base/Dockerfile
diff --git a/docker/images/build-kit/entrypoint.sh b/docker/images/build-kit-base/entrypoint.sh
similarity index 100%
rename from docker/images/build-kit/entrypoint.sh
rename to docker/images/build-kit-base/entrypoint.sh
diff --git a/docker/images/build-kit/maven-settings.xml b/docker/images/build-kit-base/maven-settings.xml
similarity index 100%
rename from docker/images/build-kit/maven-settings.xml
rename to docker/images/build-kit-base/maven-settings.xml