From 05eb21c1a99f00d74cff6fda2cfc232d0bb24973 Mon Sep 17 00:00:00 2001 From: dushixiang Date: Sun, 12 Dec 2021 14:13:25 +0800 Subject: [PATCH 1/4] Update Dockerfile --- guacd/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guacd/Dockerfile b/guacd/Dockerfile index 5259acc..9242d96 100644 --- a/guacd/Dockerfile +++ b/guacd/Dockerfile @@ -5,4 +5,6 @@ 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 From fd819abbb14253307eae82d94520762093cced44 Mon Sep 17 00:00:00 2001 From: dushixiang Date: Wed, 5 Jan 2022 11:35:48 +0800 Subject: [PATCH 2/4] Update docker-guacamole-server.yml --- .github/workflows/docker-guacamole-server.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From b5e464754939b5454dedde4c6fd342dc0b0a5d10 Mon Sep 17 00:00:00 2001 From: dushixiang Date: Wed, 5 Jan 2022 13:14:29 +0800 Subject: [PATCH 3/4] Update docker-guacd.yml --- .github/workflows/docker-guacd.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 From 4ed6e3e7f2996776076e552aa8b255fd822b425e Mon Sep 17 00:00:00 2001 From: dushixiang Date: Wed, 5 Jan 2022 13:14:57 +0800 Subject: [PATCH 4/4] Update Dockerfile --- guacd/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guacd/Dockerfile b/guacd/Dockerfile index 9242d96..7b32700 100644 --- a/guacd/Dockerfile +++ b/guacd/Dockerfile @@ -1,4 +1,4 @@ -FROM dushixiang/guacamole-server:1.3.0 +FROM dushixiang/guacamole-server:latest LABEL MAINTAINER="helloworld1024@foxmail.com"