From 16038c63bdbd4ad2d6af7e48cc3e2e90bbcead4c Mon Sep 17 00:00:00 2001 From: Clivia <132346501+Yanyutin753@users.noreply.github.com> Date: Fri, 16 Feb 2024 17:04:53 +0800 Subject: [PATCH 01/11] Create docker-image-new.yml --- .github/workflows/docker-image-new.yml | 39 ++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/docker-image-new.yml diff --git a/.github/workflows/docker-image-new.yml b/.github/workflows/docker-image-new.yml new file mode 100644 index 0000000..b3d43d9 --- /dev/null +++ b/.github/workflows/docker-image-new.yml @@ -0,0 +1,39 @@ +name: Docker Image CI + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + + # 设置 Docker Buildx + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + # 登录 Docker Hub (如果需要推送镜像) + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + # 构建并推送镜像 + - name: Build and push Docker image + uses: docker/build-push-action@v2 + with: + context: . + file: Dockerfiles/Dockerfile.native + push: true + tags: yangclivia/gpt4-copilot-java:0.0.4 + build-args: | + APP_FILE=gpt-4-copilot + platforms: linux/amd64,linux/arm64 From ba64f4ffa56caf79998cf6e96fa9d6b074b90a1a Mon Sep 17 00:00:00 2001 From: Clivia <132346501+Yanyutin753@users.noreply.github.com> Date: Fri, 16 Feb 2024 17:11:38 +0800 Subject: [PATCH 02/11] Update docker-image-new.yml --- .github/workflows/docker-image-new.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image-new.yml b/.github/workflows/docker-image-new.yml index b3d43d9..4a4233f 100644 --- a/.github/workflows/docker-image-new.yml +++ b/.github/workflows/docker-image-new.yml @@ -17,18 +17,18 @@ jobs: # 设置 Docker Buildx - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v1.6.0 # 登录 Docker Hub (如果需要推送镜像) - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v1.10.0 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} # 构建并推送镜像 - name: Build and push Docker image - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v2.7.0 with: context: . file: Dockerfiles/Dockerfile.native From 6368e112b2925f80d16d53731c1e586124dc7157 Mon Sep 17 00:00:00 2001 From: Clivia <132346501+Yanyutin753@users.noreply.github.com> Date: Fri, 16 Feb 2024 17:13:00 +0800 Subject: [PATCH 03/11] Update docker-image-new.yml --- .github/workflows/docker-image-new.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image-new.yml b/.github/workflows/docker-image-new.yml index 4a4233f..4a447c4 100644 --- a/.github/workflows/docker-image-new.yml +++ b/.github/workflows/docker-image-new.yml @@ -21,7 +21,7 @@ jobs: # 登录 Docker Hub (如果需要推送镜像) - name: Login to DockerHub - uses: docker/login-action@v1.10.0 + uses: docker/login-action@v1 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} From bf78d97fc69a20b64706c238b604cbe0611a04db Mon Sep 17 00:00:00 2001 From: Clivia <132346501+Yanyutin753@users.noreply.github.com> Date: Fri, 16 Feb 2024 17:13:17 +0800 Subject: [PATCH 04/11] Update docker-image-new.yml --- .github/workflows/docker-image-new.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image-new.yml b/.github/workflows/docker-image-new.yml index 4a447c4..884efcb 100644 --- a/.github/workflows/docker-image-new.yml +++ b/.github/workflows/docker-image-new.yml @@ -17,8 +17,8 @@ jobs: # 设置 Docker Buildx - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1.6.0 - + uses: docker/setup-buildx-action@v1 + # 登录 Docker Hub (如果需要推送镜像) - name: Login to DockerHub uses: docker/login-action@v1 From 48401ceba468a3c953023b3d8237319a7825c4e2 Mon Sep 17 00:00:00 2001 From: Clivia <132346501+Yanyutin753@users.noreply.github.com> Date: Fri, 16 Feb 2024 17:13:28 +0800 Subject: [PATCH 05/11] Update docker-image-new.yml --- .github/workflows/docker-image-new.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image-new.yml b/.github/workflows/docker-image-new.yml index 884efcb..618f9b2 100644 --- a/.github/workflows/docker-image-new.yml +++ b/.github/workflows/docker-image-new.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v2 # 设置 Docker Buildx - name: Set up Docker Buildx From 919c35f4f4cf85a54ef5946e4af5e3b47f6edd26 Mon Sep 17 00:00:00 2001 From: Clivia <132346501+Yanyutin753@users.noreply.github.com> Date: Fri, 16 Feb 2024 17:16:19 +0800 Subject: [PATCH 06/11] Update docker-image.yml --- .github/workflows/docker-image.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 9f818d4..3ad1d46 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -41,7 +41,6 @@ jobs: file: ./Dockerfiles/Dockerfile push: true tags: | - yangclivia/spring-native-image:${{ steps.tag_name.outputs.tag }} - yangclivia/spring-native-image:latest + yangclivia/gpt4-copilot-java:${{ steps.tag_name.outputs.tag }} + yangclivia/gpt4-copilot-java:latest platforms: linux/amd64,linux/arm64 - build-args: TARGETPLATFORM=${{ matrix.platform }} From 340457b3a42692e40bead5123ac32ca4b535374c Mon Sep 17 00:00:00 2001 From: Clivia <132346501+Yanyutin753@users.noreply.github.com> Date: Fri, 16 Feb 2024 18:08:27 +0800 Subject: [PATCH 07/11] Update docker-image-new.yml --- .github/workflows/docker-image-new.yml | 70 ++++++++++++++------------ 1 file changed, 38 insertions(+), 32 deletions(-) diff --git a/.github/workflows/docker-image-new.yml b/.github/workflows/docker-image-new.yml index 618f9b2..3152db1 100644 --- a/.github/workflows/docker-image-new.yml +++ b/.github/workflows/docker-image-new.yml @@ -1,39 +1,45 @@ -name: Docker Image CI +name: Build and Push Docker Image on: - push: - branches: [ "main" ] - pull_request: - branches: [ "main" ] + release: + types: [ created ] + workflow_dispatch: + inputs: + tag: + description: 'Tag Name' + required: true + jobs: - - build: - + build-and-push: runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - # 设置 Docker Buildx - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - # 登录 Docker Hub (如果需要推送镜像) - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + - uses: actions/checkout@v2 - # 构建并推送镜像 - - name: Build and push Docker image - uses: docker/build-push-action@v2.7.0 - with: - context: . - file: Dockerfiles/Dockerfile.native - push: true - tags: yangclivia/gpt4-copilot-java:0.0.4 - build-args: | - APP_FILE=gpt-4-copilot - platforms: linux/amd64,linux/arm64 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Login to Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + + - name: Set tag name + id: tag_name + run: | + if [ "${{ github.event_name }}" = "release" ]; then + echo "::set-output name=tag::${GITHUB_REF#refs/tags/}" + elif [ "${{ github.event_name }}" = "workflow_dispatch" ]; then + echo "::set-output name=tag::${{ github.event.inputs.tag }}" + fi + + - name: Build and push Docker image with Release tag + uses: docker/build-push-action@v2 + with: + context: . + file: ./Dockerfiles/Dockerfile + push: true + tags: | + yangclivia/gpt4-copilot-java:amd64${{ steps.tag_name.outputs.tag }} + platforms: linux/amd64 From 868713707c2e7208fcc1081e8bbb40a9d6a2eae2 Mon Sep 17 00:00:00 2001 From: Clivia <132346501+Yanyutin753@users.noreply.github.com> Date: Fri, 16 Feb 2024 18:40:34 +0800 Subject: [PATCH 08/11] Create docker-image-arm64.yml --- .github/workflows/docker-image-arm64.yml | 45 ++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 .github/workflows/docker-image-arm64.yml diff --git a/.github/workflows/docker-image-arm64.yml b/.github/workflows/docker-image-arm64.yml new file mode 100644 index 0000000..72d90f9 --- /dev/null +++ b/.github/workflows/docker-image-arm64.yml @@ -0,0 +1,45 @@ +name: Build and Push Docker Image -arm64 + +on: + release: + types: [ created ] + workflow_dispatch: + inputs: + tag: + description: 'Tag Name' + required: true + + +jobs: + build-and-push: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + + - name: Login to Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_PASSWORD }} + + - name: Set tag name + id: tag_name + run: | + if [ "${{ github.event_name }}" = "release" ]; then + echo "::set-output name=tag::${GITHUB_REF#refs/tags/}" + elif [ "${{ github.event_name }}" = "workflow_dispatch" ]; then + echo "::set-output name=tag::${{ github.event.inputs.tag }}" + fi + + - name: Build and push Docker image with Release tag + uses: docker/build-push-action@v2 + with: + context: . + file: ./Dockerfiles/Dockerfile + push: true + tags: | + yangclivia/gpt4-copilot-java:${{ steps.tag_name.outputs.tag }}-arm64 + platforms: linux/arm64 From 74152a0296c8592e2e288c32f8086f54981cb678 Mon Sep 17 00:00:00 2001 From: Clivia <132346501+Yanyutin753@users.noreply.github.com> Date: Fri, 16 Feb 2024 18:41:07 +0800 Subject: [PATCH 09/11] Update docker-image-new.yml --- .github/workflows/docker-image-new.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image-new.yml b/.github/workflows/docker-image-new.yml index 3152db1..fa8589a 100644 --- a/.github/workflows/docker-image-new.yml +++ b/.github/workflows/docker-image-new.yml @@ -1,4 +1,4 @@ -name: Build and Push Docker Image +name: Build and Push Docker Image -Amd64 on: release: @@ -41,5 +41,5 @@ jobs: file: ./Dockerfiles/Dockerfile push: true tags: | - yangclivia/gpt4-copilot-java:amd64${{ steps.tag_name.outputs.tag }} + yangclivia/gpt4-copilot-java:${{ steps.tag_name.outputs.tag }}-amd64 platforms: linux/amd64 From 33ee015b4e149a5ee299deb4e95f42ae491ae6f9 Mon Sep 17 00:00:00 2001 From: Clivia <132346501+Yanyutin753@users.noreply.github.com> Date: Fri, 16 Feb 2024 18:41:19 +0800 Subject: [PATCH 10/11] Rename docker-image-new.yml to docker-image-amd64.yml --- .../workflows/{docker-image-new.yml => docker-image-amd64.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{docker-image-new.yml => docker-image-amd64.yml} (100%) diff --git a/.github/workflows/docker-image-new.yml b/.github/workflows/docker-image-amd64.yml similarity index 100% rename from .github/workflows/docker-image-new.yml rename to .github/workflows/docker-image-amd64.yml From d822306769d326e55db1a4682a5cc02ac385fdb7 Mon Sep 17 00:00:00 2001 From: Clivia <132346501+Yanyutin753@users.noreply.github.com> Date: Fri, 16 Feb 2024 18:41:40 +0800 Subject: [PATCH 11/11] Update docker-image-arm64.yml --- .github/workflows/docker-image-arm64.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image-arm64.yml b/.github/workflows/docker-image-arm64.yml index 72d90f9..79509dc 100644 --- a/.github/workflows/docker-image-arm64.yml +++ b/.github/workflows/docker-image-arm64.yml @@ -1,4 +1,4 @@ -name: Build and Push Docker Image -arm64 +name: Build and Push Docker Image -Arm64 on: release: