From 17552bdf74f45af7be3cbbf45855abbee6ca2aa6 Mon Sep 17 00:00:00 2001 From: jack ning Date: Mon, 25 Nov 2024 11:41:47 +0800 Subject: [PATCH] update --- .github/workflows/maven.yml | 12 ++++++++++-- starter/Dockerfile | 2 +- starter/README.md | 39 +++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 starter/README.md diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 8fdacf70fe..61fe07a522 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -44,6 +44,10 @@ jobs: mvn -B -DskipTests=true install --file pom.xml cd starter mvn -B -DskipTests=true package --file pom.xml + # 提取 Git 标签 + - name: Extract Git tag + id: extract_tag + run: echo "TAG=$(echo ${GITHUB_REF#refs/tags/})" >> $GITHUB_ENV # https://github.com/docker/login-action - name: login to docker hub uses: docker/login-action@v3 @@ -58,16 +62,19 @@ jobs: docker buildx create --use --name mybuilder docker buildx inspect mybuilder --bootstrap # 构建并推送 Docker 镜像到 Docker Hub + # https://hub.docker.com/r/bytedesk/bytedesk - name: Build and push Docker image to Docker Hub uses: docker/build-push-action@v6 with: context: ./starter # 确保构建上下文路径正确 file: ./starter/Dockerfile # 确保 Dockerfile 文件路径正确 push: true - tags: ${{ secrets.DOCKER_HUB_USERNAME }}/bytedesk:latest + tags: ${{ secrets.DOCKER_HUB_USERNAME }}/bytedesk:${{ env.TAG }} + # https://hub.docker.com/_/eclipse-temurin # eclipse-temurin:17-jdk暂时不支持更多架构,暂时渠道:windows/arm64,macos/amd64,macos/arm64 platforms: linux/amd64,linux/arm64,linux/arm/v7,windows/amd64 # 登录阿里云 Docker + # https://registry.cn-hangzhou.aliyuncs.com/weiyuai/bytedesk:latest - name: login to aliyun docker run: echo ${{ secrets.ALIYUN_DOCKER_PASSWORD }} | docker login --username ${{ secrets.ALIYUN_DOCKER_USERNAME }} --password-stdin registry.cn-hangzhou.aliyuncs.com # 构建并推送 Docker 镜像到阿里云 @@ -77,6 +84,7 @@ jobs: context: ./starter # 确保构建上下文路径正确 file: ./starter/Dockerfile # 确保 Dockerfile 文件路径正确 push: true - tags: registry.cn-hangzhou.aliyuncs.com/weiyuai/bytedesk:latest + tags: registry.cn-hangzhou.aliyuncs.com/weiyuai/bytedesk:${{ env.TAG }} + # https://hub.docker.com/_/eclipse-temurin # eclipse-temurin:17-jdk暂时不支持更多架构,暂时渠道:windows/arm64,macos/amd64,macos/arm64 platforms: linux/amd64,linux/arm64,linux/arm/v7,windows/amd64 \ No newline at end of file diff --git a/starter/Dockerfile b/starter/Dockerfile index 5abb14d424..cff04045b1 100644 --- a/starter/Dockerfile +++ b/starter/Dockerfile @@ -1,6 +1,6 @@ # https://spring.io/guides/topicals/spring-boot-docker # https://hub.docker.com/r/bytedesk/bytedesk -# maven +# https://hub.docker.com/_/eclipse-temurin FROM eclipse-temurin:17-jdk # FROM adoptopenjdk:17-jdk-hotspot # maintainer diff --git a/starter/README.md b/starter/README.md new file mode 100644 index 0000000000..b1e2a520a8 --- /dev/null +++ b/starter/README.md @@ -0,0 +1,39 @@ + +# Bytedesk Docker Image + +## 简介 + +这是 Bytedesk 的 Docker 镜像 + +## 使用方法 + +### 拉取镜像 + +```sh +docker pull bytedesk/bytedesk:latest +``` + +## 端口 + +9003:应用程序端口 + +## 维护者 + +- <270580156@qq.com>(jackning) + +## 许可证 + +此项目遵循 MIT 许可证。详情请参阅 LICENSE 文件。