Merge branch 'main' of github.com:maxkb-dev/maxkb

.github/workflows/build-and-push.yml

@@ -34,7 +34,7 @@ jobs:
         id: prepare
         run: |
           DOCKER_IMAGE=registry-hkproxy.fit2cloud.com/maxkb/maxkb
-          DOCKER_PLATFORMS=linux/amd64,linux/arm64
+          DOCKER_PLATFORMS=linux/amd64
           TAG_NAME=${{ github.event.inputs.dockerImageTag }}
           DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest"
           echo ::set-output name=docker_image::${DOCKER_IMAGE}
@@ -49,12 +49,18 @@ jobs:
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-      - name: Login to Registry
+      - name: Login to FIT2CLOUD Registry
         uses: docker/login-action@v3
         with:
           registry: registry-hkproxy.fit2cloud.com
           username: ${{ secrets.FIT2CLOUD_REGISTRY_USERNAME }}
           password: ${{ secrets.FIT2CLOUD_REGISTRY_PASSWORD }}
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GH_TOKEN }}
       - name: Docker Buildx (build-and-push)
         run: |
           docker buildx build --output "type=image,push=true" ${{ steps.prepare.outputs.buildx_args }} -f installer/Dockerfile
@@ -84,7 +90,7 @@ jobs:
         id: prepare
         run: |
           DOCKER_IMAGE=ghcr.io/maxkb-dev/maxkb
-          DOCKER_PLATFORMS=linux/amd64,linux/arm64
+          DOCKER_PLATFORMS=linux/amd64
           TAG_NAME=${{ github.event.inputs.dockerImageTag }}
           DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest"
           echo ::set-output name=docker_image::${DOCKER_IMAGE}

installer/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/maxkb-dev/python-pg:v1.0.0 as vector-model
+FROM ghcr.io/maxkb-dev/vector-model:v1.0.0 as vector-model
 
 FROM node:18-alpine3.18 as web-build
 COPY ui ui

installer/Dockerfile-python-pg

@@ -14,6 +14,8 @@ ENV POSTGRES_USER root
 
 ENV POSTGRES_PASSWORD Password123@postgres
 
+# ---- prepare python env --- #
+# ---- below content is copied from https://github.com/docker-library/python/blob/master/3.11/slim-bookworm/Dockerfile --- #
 ENV PATH /usr/local/bin:$PATH
 
 # http://bugs.python.org/issue19846