evan/next-terminal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
dushixiang 2022-01-23 17:53:53 +08:00
commit a372e8ae8c
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/docker-guacamole-server.yml vendored
View File

@ -34,6 +34,6 @@ jobs:
push: true push: true
tags: | tags: |
${{ secrets.DOCKERHUB_USERNAME }}/guacamole-server:latest ${{ 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-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/guacamole-server:cache
cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/guacamole-server:cache,mode=max cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/guacamole-server:cache,mode=max

6
.github/workflows/docker-guacd.yml vendored
View File

@ -34,7 +34,9 @@ jobs:
file: guacd/Dockerfile file: guacd/Dockerfile
push: true push: true
tags: | tags: |
${{ secrets.DOCKERHUB_USERNAME }}/guacd:1.3.0 ${{ secrets.DOCKERHUB_USERNAME }}/guacd:1.4.0
registry.cn-beijing.aliyuncs.com/${{ secrets.DOCKERHUB_USERNAME }}/guacd:1.3.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-from: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/guacd:cache
cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/guacd:cache,mode=max cache-to: type=registry,ref=${{ secrets.DOCKERHUB_USERNAME }}/guacd:cache,mode=max

6
guacd/Dockerfile
View File

@ -1,8 +1,10 @@
FROM dushixiang/guacamole-server:1.3.0 FROM dushixiang/guacamole-server:latest
LABEL MAINTAINER="helloworld1024@foxmail.com" LABEL MAINTAINER="helloworld1024@foxmail.com"
COPY ./guacd/fonts/Menlo-Regular.ttf /usr/share/fonts/ COPY ./guacd/fonts/Menlo-Regular.ttf /usr/share/fonts/
COPY ./guacd/fonts/SourceHanSansCN-Regular.otf /usr/share/fonts/ COPY ./guacd/fonts/SourceHanSansCN-Regular.otf /usr/share/fonts/
RUN mkfontscale && mkfontdir && fc-cache user root
RUN mkfontscale && mkfontdir && fc-cache