update: code review

Signed-off-by: Wen Zhou <wenzhou@redhat.com>

Author: zdtsw

.github/actions/docker-build-and-push/action.yml

@@ -28,25 +28,37 @@ runs:
       uses: docker/setup-buildx-action@v3
 
     - name: Login to GitHub Container Registry
-      run: echo "${{ inputs.github-token }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+      run: echo "${GITHUB_TOKEN}" | docker login ghcr.io -u "${GITHUB_ACTOR}" --password-stdin
       shell: bash
+      env:
+        GITHUB_TOKEN: ${{ inputs.github-token }}
 
     - name: Print image info
       run: |
-        echo "Image name: ${{ inputs.image-name }}"
-        echo "Tag: ${{ inputs.tag }}"
-        echo "Registry: ${{ inputs.registry }}"
+        echo "Image name: ${IMAGE_NAME}"
+        echo "Tag: ${TAG}"
+        echo "Registry: ${REGISTRY}"
       shell: bash
+      env:
+        IMAGE_NAME: ${{ inputs.image-name }}
+        TAG: ${{ inputs.tag }}
+        REGISTRY: ${{ inputs.registry }}
 
     - name: Build image and push
       run: |
         DOCKERFILE_ARG=""
-        if [ -n "${{ inputs.dockerfile }}" ]; then
-          DOCKERFILE_ARG="-f ${{ inputs.dockerfile }}"
+        if [ -n "${DOCKERFILE}" ]; then
+          DOCKERFILE_ARG="-f ${DOCKERFILE}"
         fi
         docker buildx build \
           --platform linux/amd64 \
           ${DOCKERFILE_ARG} \
-          -t ${{ inputs.registry }}/${{ inputs.image-name }}:${{ inputs.tag }} \
-          --push ${{ inputs.context }}
+          -t "${REGISTRY}/${IMAGE_NAME}:${TAG}" \
+          --push "${CONTEXT}"
       shell: bash
+      env:
+        DOCKERFILE: ${{ inputs.dockerfile }}
+        REGISTRY: ${{ inputs.registry }}
+        IMAGE_NAME: ${{ inputs.image-name }}
+        TAG: ${{ inputs.tag }}
+        CONTEXT: ${{ inputs.context }}

.github/workflows/ci-release-uds-tokenizer.yaml

@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to GitHub Container Registry
         if: github.event_name == 'push'

services/uds_tokenizer/Dockerfile

@@ -17,7 +17,6 @@ FROM --platform=$TARGETPLATFORM python:3.10-slim as builder
 
 # Set build arguments
 ARG TARGETPLATFORM
-ARG BUILDPLATFORM
 
 # Set working directory
 WORKDIR /app

services/uds_tokenizer/Dockerfile.konflux

@@ -17,7 +17,6 @@ FROM --platform=$TARGETPLATFORM registry.access.redhat.com/ubi9/python-312:9.7 a
 
 # Set build arguments
 ARG TARGETPLATFORM
-ARG BUILDPLATFORM
 
 # Set working directory
 WORKDIR /app