From c1655f1f7dad6c2504ccbb2b3f33543cb0d181a3 Mon Sep 17 00:00:00 2001 From: liqiang-fit2cloud Date: Fri, 15 Mar 2024 14:04:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?build:=20=E5=88=86=E5=BC=80=E9=95=9C?= =?UTF-8?q?=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- installer/Dockerfile-python-pg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/installer/Dockerfile-python-pg b/installer/Dockerfile-python-pg index 0032f9da0..6db2a7966 100644 --- a/installer/Dockerfile-python-pg +++ b/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 From 166d200af4412f2cac3884280ead8a5e83180c4a Mon Sep 17 00:00:00 2001 From: liqiang-fit2cloud Date: Fri, 15 Mar 2024 14:21:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?build:=20=E5=88=86=E5=BC=80=E9=95=9C?= =?UTF-8?q?=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-and-push-python-pg.yml | 2 +- .github/workflows/build-and-push.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-push-python-pg.yml b/.github/workflows/build-and-push-python-pg.yml index 478fdbab4..dcd9c3ece 100644 --- a/.github/workflows/build-and-push-python-pg.yml +++ b/.github/workflows/build-and-push-python-pg.yml @@ -15,7 +15,7 @@ jobs: id: prepare run: | DOCKER_IMAGE=ghcr.io/maxkb-dev/python-pg - DOCKER_PLATFORMS=linux/amd64,linux/arm64 + DOCKER_PLATFORMS=linux/amd64 TAG_NAME=python3.11.8-pg15.6 DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest" echo ::set-output name=docker_image::${DOCKER_IMAGE} diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index 2afe5e026..37e65db69 100644 --- a/.github/workflows/build-and-push.yml +++ b/.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} @@ -84,7 +84,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} From 6d2a30c16aa974d0b943aa45040f0a500e9799f3 Mon Sep 17 00:00:00 2001 From: liqiang-fit2cloud Date: Fri, 15 Mar 2024 14:36:53 +0800 Subject: [PATCH 3/5] =?UTF-8?q?build:=20=E5=88=86=E5=BC=80=E9=95=9C?= =?UTF-8?q?=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-and-push-python-pg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-push-python-pg.yml b/.github/workflows/build-and-push-python-pg.yml index dcd9c3ece..478fdbab4 100644 --- a/.github/workflows/build-and-push-python-pg.yml +++ b/.github/workflows/build-and-push-python-pg.yml @@ -15,7 +15,7 @@ jobs: id: prepare run: | DOCKER_IMAGE=ghcr.io/maxkb-dev/python-pg - DOCKER_PLATFORMS=linux/amd64 + DOCKER_PLATFORMS=linux/amd64,linux/arm64 TAG_NAME=python3.11.8-pg15.6 DOCKER_IMAGE_TAGS="--tag ${DOCKER_IMAGE}:${TAG_NAME} --tag ${DOCKER_IMAGE}:latest" echo ::set-output name=docker_image::${DOCKER_IMAGE} From bf6d700c5ad6a0f5808c82820cb705c314a98e33 Mon Sep 17 00:00:00 2001 From: liqiang-fit2cloud Date: Fri, 15 Mar 2024 14:41:32 +0800 Subject: [PATCH 4/5] =?UTF-8?q?build:=20=E5=88=86=E5=BC=80=E9=95=9C?= =?UTF-8?q?=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- installer/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer/Dockerfile b/installer/Dockerfile index 1d50b06e5..a9094af77 100644 --- a/installer/Dockerfile +++ b/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 From 1f6e66edc143dd79f509340b299c15ce3e814003 Mon Sep 17 00:00:00 2001 From: liqiang-fit2cloud Date: Fri, 15 Mar 2024 14:48:50 +0800 Subject: [PATCH 5/5] =?UTF-8?q?build:=20=E5=88=86=E5=BC=80=E9=95=9C?= =?UTF-8?q?=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build-and-push.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml index 37e65db69..aa24c95ff 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-and-push.yml @@ -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