Merge pull request #92 from stoneshi-yunify/master

create link docker to podman

Author: ks-ci-bot

.github/actions/build/action.yml

@@ -46,7 +46,6 @@ runs:
     - uses: actions/checkout@v4
     - name: Docker meta for KubeSphere
       id: meta
-      if: github.repository_owner == 'kubesphere'
       uses: docker/metadata-action@v5
       with:
         images: |
@@ -55,21 +54,19 @@ runs:
           type=ref,event=branch,suffix=${{ inputs.tag-suffix }}
           type=ref,event=pr,suffix=${{ inputs.tag-suffix }}
           type=semver,pattern={{version}},prefix=v,suffix=${{ inputs.tag-suffix }}
-          type=raw,value=latest
+          type=raw,value=latest,suffix=${{ inputs.tag-suffix }}
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
     - name: Login to DockerHub
-      if: github.event_name != 'pull_request' && github.repository_owner == 'kubesphere'
       uses: docker/login-action@v3
       with:
         registry: ${{ inputs.docker-registry }}
         username: ${{ inputs.docker-namespace }}
         password: ${{ inputs.docker-password }}
     - name: Build and push Docker images
       uses: docker/build-push-action@v6
-      if: github.repository_owner == 'kubesphere'
       with:
         context: ${{ inputs.context }}
         file: ${{ inputs.dockerfile }}

.github/workflows/build.yaml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Build base agent
+      - name: Build base agent for docker
         uses: ./.github/actions/build
         with:
           context: base
@@ -22,3 +22,14 @@ jobs:
           platforms: linux/amd64,linux/arm64
           docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
           docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}
+
+      - name: Build base agent for podman
+        uses: ./.github/actions/build
+        with:
+          context: base
+          dockerfile: base/podman/Dockerfile
+          image-name: builder-base
+          tag-suffix: -podman
+          platforms: linux/amd64,linux/arm64
+          docker-namespace: ${{ secrets.DOCKER_HUB_USER }}
+          docker-password: ${{ secrets.DOCKER_HUB_SECRETS }}

README.md

@@ -21,9 +21,12 @@ Welcome to contribute.
 ## Images
 Images for both production and development:
 
-| Name                      | Introduction             | Docker Pulls                                                                                                                          |
-|---------------------------|--------------------------|---------------------------------------------------------------------------------------------------------------------------------------|
-| `kubesphere/builder-base` | [README](base/README.md) | [![Docker Pulls](https://img.shields.io/docker/pulls/kubesphere/builder-go.svg)](https://hub.docker.com/r/kubesphere/builder-go/tags) |
+| Name                      | Introduction             | Docker Pulls                                                                                                                              |
+|---------------------------|--------------------------|-------------------------------------------------------------------------------------------------------------------------------------------|
+| `kubesphere/builder-base` | [README](base/README.md) | [![Docker Pulls](https://img.shields.io/docker/pulls/kubesphere/builder-base.svg)](https://hub.docker.com/r/kubesphere/builder-base/tags) |
+
+**NOTE**
+1. The image with tag `x.y.z-podman` has the very same utilities installed compared to the `x.y.z` image, the only difference is that the `x.y.z-podman` image makes a symbolic link of `docker` to `podman`, for easy use and backward compatibility.
 
 ## Legacy Images
 Legacy images built on centos:7 are no longer developed but may be still working.

base/README.md

@@ -17,6 +17,3 @@ Base image with latest common sdks and utilities built with ubuntu, include:
 - ks
 - ...
 
-**NOTE**
-1. Because the image has both docker and podman installed, `docker` command is no longer a alias of `podman`, you should use `podman` command explicitly.
-

base/podman/Dockerfile

@@ -0,0 +1,2 @@
+FROM kubesphere/builder-base:latest
+RUN ln -s -f /usr/bin/podman /usr/bin/docker