diff --git a/.github/workflows/docker-guacamole-server.yml b/.github/workflows/docker-guacamole-server.yml index 553c190..9a89649 100644 --- a/.github/workflows/docker-guacamole-server.yml +++ b/.github/workflows/docker-guacamole-server.yml @@ -34,6 +34,6 @@ jobs: push: true tags: | ${{ secrets.DOCKERHUB_USERNAME }}/guacamole-server:latest - ${{ secrets.DOCKERHUB_USERNAME }}/guacamole-server:1.3.0 + ${{ secrets.DOCKERHUB_USERNAME }}/guacamole-server:1.4.0 cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/guacamole-server:cache cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/guacamole-server:cache,mode=max diff --git a/.github/workflows/docker-guacd.yml b/.github/workflows/docker-guacd.yml index 866c2c7..8aac92d 100644 --- a/.github/workflows/docker-guacd.yml +++ b/.github/workflows/docker-guacd.yml @@ -34,7 +34,9 @@ jobs: file: guacd/Dockerfile push: true tags: | - ${{ secrets.DOCKERHUB_USERNAME }}/guacd:1.3.0 - registry.cn-beijing.aliyuncs.com/${{ secrets.DOCKERHUB_USERNAME }}/guacd:1.3.0 + ${{ secrets.DOCKERHUB_USERNAME }}/guacd:1.4.0 + ${{ secrets.DOCKERHUB_USERNAME }}/guacd:latest + registry.cn-beijing.aliyuncs.com/${{ secrets.DOCKERHUB_USERNAME }}/guacd:1.4.0 + registry.cn-beijing.aliyuncs.com/${{ secrets.DOCKERHUB_USERNAME }}/guacd:latest cache-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/guacd:cache cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/guacd:cache,mode=max diff --git a/guacd/Dockerfile b/guacd/Dockerfile index 5259acc..7b32700 100644 --- a/guacd/Dockerfile +++ b/guacd/Dockerfile @@ -1,8 +1,10 @@ -FROM dushixiang/guacamole-server:1.3.0 +FROM dushixiang/guacamole-server:latest LABEL MAINTAINER="helloworld1024@foxmail.com" COPY ./guacd/fonts/Menlo-Regular.ttf /usr/share/fonts/ COPY ./guacd/fonts/SourceHanSansCN-Regular.otf /usr/share/fonts/ -RUN mkfontscale && mkfontdir && fc-cache \ No newline at end of file +user root + +RUN mkfontscale && mkfontdir && fc-cache