Rename container image name -> clp-package

Author: junhaoliao

.github/actions/clp-build-runtime-image/action.yaml

@@ -59,12 +59,12 @@ runs:
       shell: "bash"
       run: |
         base_path="./tools/docker-images"
-        platform="${{inputs.platform_id}}-${{inputs.platform_version_id}}"
 
         if [[ "${{inputs.image_type}}" == "execution" ]]; then
+          platform="${{inputs.platform_id}}-${{inputs.platform_version_id}}"
           dockerfile_path="$base_path/clp-execution-base-$platform/Dockerfile"
         else
-          dockerfile_path="$base_path/clp-package-$platform/Dockerfile"
+          dockerfile_path="$base_path/clp-package/Dockerfile"
         fi
 
         echo "DOCKERFILE=$dockerfile_path" >> "$GITHUB_OUTPUT"

.github/workflows/clp-package-image-build.yaml

@@ -42,7 +42,7 @@ jobs:
               - "components/core/tools/scripts/lib_install/*.sh"
               - "components/core/tools/docker-images/clp-env-base-ubuntu-jammy/**"
               - "components/core/tools/scripts/lib_install/ubuntu-jammy/**"
-              - "tools/docker-images/clp-package-ubuntu-jammy/**"
+              - "tools/docker-images/clp-package/**"
 
   ubuntu-jammy-deps-image:
     name: "ubuntu-jammy-deps-image"

docs/src/dev-guide/building-package.md

@@ -77,8 +77,7 @@ To build a Docker image containing the CLP package, run:
 task docker-image-package
 ```
 
-This will create a Docker image named `clp-package-<arch>-ubuntu-jammy:dev` where `<arch>` is `x86`
-or `arm64`.
+This will create a Docker image named `clp-package:dev`.
 
 [clp-issue-872]: https://github.com/y-scope/clp/issues/872
 [Task]: https://taskfile.dev/

docs/src/dev-guide/tooling-containers.md

@@ -133,14 +133,14 @@ environment.
   tools/docker-images/clp-execution-base-ubuntu-jammy
   ```
 
-## clp-package-x86-ubuntu-jammy
+## clp-package
 
-An image containing the CLP package built in an Ubuntu Jammy x86_64 environment.
+An image containing the CLP package.
 
 * Path:
 
   ```text
-  tools/docker-images/clp-package-ubuntu-jammy
+  tools/docker-images/clp-package
   ```
 
 [core-deps-centos-stream-9]: https://github.com/y-scope/clp/pkgs/container/clp%2Fclp-core-dependencies-x86-centos-stream-9

taskfile.yaml

@@ -164,7 +164,7 @@ tasks:
 
   docker-image-package:
     vars:
-      SRC_DIR: "{{.ROOT_DIR}}/tools/docker-images/clp-package-ubuntu-jammy"
+      SRC_DIR: "{{.ROOT_DIR}}/tools/docker-images/clp-package"
     dir: "{{.SRC_DIR}}"
     deps:
       - "package"

…ages/clp-package-ubuntu-jammy/Dockerfile …ols/docker-images/clp-package/Dockerfiletools/docker-images/clp-package-ubuntu-jammy/Dockerfile renamed to tools/docker-images/clp-package/Dockerfile tools/docker-images/clp-package-ubuntu-jammy/Dockerfile renamed to tools/docker-images/clp-package/Dockerfile

@@ -4,7 +4,7 @@ COPY ./build/clp-package /opt/clp
 
 WORKDIR /root
 
-COPY ./tools/docker-images/clp-package-ubuntu-jammy/setup-scripts ./setup-scripts
+COPY ./tools/docker-images/clp-package/setup-scripts ./setup-scripts
 RUN ./setup-scripts/install-prebuilt-packages.sh && \
     rm -rf ./setup-scripts/
 

…images/clp-package-ubuntu-jammy/build.sh tools/docker-images/clp-package/build.shtools/docker-images/clp-package-ubuntu-jammy/build.sh renamed to tools/docker-images/clp-package/build.sh tools/docker-images/clp-package-ubuntu-jammy/build.sh renamed to tools/docker-images/clp-package/build.sh

@@ -6,20 +6,9 @@ set -o pipefail
 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
 repo_root=${script_dir}/../../../
 
-arch=$(uname -m)
-
-if [ "$arch" = "x86_64" ]; then
-    arch_name="x86"
-elif [ "$arch" = "aarch64" ]; then
-    arch_name="arm64"
-else
-    echo "Error: Unsupported architecture - $arch"
-    exit 1
-fi
-
 build_cmd=(
     docker build
-    --tag "clp-package-${arch_name}-ubuntu-jammy:dev"
+    --tag "clp-package:dev"
     "$repo_root"
     --file "${script_dir}/Dockerfile"
 )