VladPolskiy/docker
1
0
Fork 0
mirror of https://github.com/gshang2017/docker.git synced 2025-07-20 16:51:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

baidunetdisk debian12

Browse Source
This commit is contained in:
John
2024-10-25 17:35:45 +08:00
parent f13c89c117
commit 7d6ede1a70
6 changed files with 68 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
.github/workflows/baidunetdisk-arm64.yml vendored
View File

@ -1,77 +0,0 @@
name: baidunetdisk-arm64
on:
push:
paths:
- 'baidunetdisk/Dockerfile.arm64'
workflow_dispatch:
jobs:
job1:
name: buildx tag
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: 'Set env'
run: |
echo "BAIDUNETDISK_VER=$(echo `grep -n "BAIDUNETDISK_VER=" baidunetdisk/Dockerfile`|awk -F= '{print $2}')" >> $GITHUB_ENV
echo "BAIDUNETDISK_VER_ARM64=$(echo `grep -n "BAIDUNETDISK_VER=" baidunetdisk/Dockerfile.arm64`|awk -F= '{print $2}')" >> $GITHUB_ENV
- name: Set up QEMU
id: qemu
uses: docker/setup-qemu-action@v2
with:
platforms: all
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
with:
version: latest
- name: Login to DockerHub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Login to GHCR
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push
uses: docker/build-push-action@v2
with:
context: ./baidunetdisk
file: ./baidunetdisk/Dockerfile.arm64
platforms: linux/arm64
push: true
tags: |
johngong/baidunetdisk:v_${{ env.BAIDUNETDISK_VER_ARM64 }}_arm64v8
ghcr.io/gshang2017/baidunetdisk:v_${{ env.BAIDUNETDISK_VER_ARM64 }}_arm64v8
- name: create version tag
run: |
docker buildx imagetools create -t johngong/baidunetdisk:latest \
johngong/baidunetdisk:v_${{ env.BAIDUNETDISK_VER }} \
johngong/baidunetdisk:v_${{ env.BAIDUNETDISK_VER_ARM64 }}_arm64v8
- name: create version tag(ghcr.io)
run: |
docker buildx imagetools create -t ghcr.io/gshang2017/baidunetdisk:latest \
ghcr.io/gshang2017/baidunetdisk:v_${{ env.BAIDUNETDISK_VER }} \
ghcr.io/gshang2017/baidunetdisk:v_${{ env.BAIDUNETDISK_VER_ARM64 }}_arm64v8
- name: Docker Hub Description
uses: peter-evans/dockerhub-description@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
repository: johngong/baidunetdisk
short-description: 官方百度网盘客户端VNC版:(baidunetdisk:${{ env.BAIDUNETDISK_VER }})
readme-filepath: ./baidunetdisk/README.md

38
.github/workflows/baidunetdisk.yml vendored
View File

@ -13,60 +13,72 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: 'Set env'
run: |
echo "BAIDUNETDISK_VER=$(echo `grep -n "BAIDUNETDISK_VER=" baidunetdisk/Dockerfile`|awk -F= '{print $2}')" >> $GITHUB_ENV
echo "BAIDUNETDISK_VER_ARM64=$(echo `grep -n "BAIDUNETDISK_VER=" baidunetdisk/Dockerfile.arm64`|awk -F= '{print $2}')" >> $GITHUB_ENV
echo "BAIDUNETDISK_VER_ARM64=$(echo `grep -n "BAIDUNETDISK_VER_ARM64=" baidunetdisk/Dockerfile`|awk -F= '{print $2}')" >> $GITHUB_ENV
echo "BASEIMAGE_GUI_VER=$(echo `grep -n "baseimage-gui" baidunetdisk/Dockerfile`|awk -Fv '{print $2}')" >> $GITHUB_ENV
- name: Set up QEMU
id: qemu
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
with:
platforms: all
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
version: latest
- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
- name: Login to GHCR
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
context: ./baidunetdisk
file: ./baidunetdisk/Dockerfile
platforms: linux/amd64
push: true
tags: |
johngong/baidunetdisk:v_${{ env.BAIDUNETDISK_VER }}
ghcr.io/gshang2017/baidunetdisk:v_${{ env.BAIDUNETDISK_VER }}
johngong/baidunetdisk:v_${{ env.BAIDUNETDISK_VER }}_${{ env.BASEIMAGE_GUI_VER }}_amd64
ghcr.io/gshang2017/baidunetdisk:v_${{ env.BAIDUNETDISK_VER }}_${{ env.BASEIMAGE_GUI_VER }}_amd64
- name: Build and push
uses: docker/build-push-action@v6
with:
context: ./baidunetdisk
file: ./baidunetdisk/Dockerfile
platforms: linux/arm64
push: true
tags: |
johngong/baidunetdisk:v_${{ env.BAIDUNETDISK_VER_ARM64 }}_${{ env.BASEIMAGE_GUI_VER }}_arm64v8
ghcr.io/gshang2017/baidunetdisk:v_${{ env.BAIDUNETDISK_VER_ARM64 }}_${{ env.BASEIMAGE_GUI_VER }}_arm64v8
- name: create version tag
run: |
docker buildx imagetools create -t johngong/baidunetdisk:latest \
johngong/baidunetdisk:v_${{ env.BAIDUNETDISK_VER }} \
johngong/baidunetdisk:v_${{ env.BAIDUNETDISK_VER_ARM64 }}_arm64v8
johngong/baidunetdisk:v_${{ env.BAIDUNETDISK_VER }}_${{ env.BASEIMAGE_GUI_VER }}_amd64 \
johngong/baidunetdisk:v_${{ env.BAIDUNETDISK_VER_ARM64 }}_${{ env.BASEIMAGE_GUI_VER }}_arm64v8
- name: create version tag(ghcr.io)
run: |
docker buildx imagetools create -t ghcr.io/gshang2017/baidunetdisk:latest \
ghcr.io/gshang2017/baidunetdisk:v_${{ env.BAIDUNETDISK_VER }} \
ghcr.io/gshang2017/baidunetdisk:v_${{ env.BAIDUNETDISK_VER_ARM64 }}_arm64v8
ghcr.io/gshang2017/baidunetdisk:v_${{ env.BAIDUNETDISK_VER }}_${{ env.BASEIMAGE_GUI_VER }}_amd64 \
ghcr.io/gshang2017/baidunetdisk:v_${{ env.BAIDUNETDISK_VER_ARM64 }}_${{ env.BASEIMAGE_GUI_VER }}_arm64v8
- name: Docker Hub Description
uses: peter-evans/dockerhub-description@v3

16
baidunetdisk/Dockerfile
View File

@ -1,6 +1,7 @@
FROM jlesage/baseimage-gui:debian-10-v4.2.2
FROM jlesage/baseimage-gui:debian-12-v4.6.4
ARG BAIDUNETDISK_VER=4.17.7
ARG BAIDUNETDISK_VER_ARM64=4.17.7
ENV APP_NAME="Baidunetdisk"
ENV NOVNC_LANGUAGE="zh_Hans"
@ -13,13 +14,16 @@ COPY --chmod=755 startapp.sh /startapp.sh
RUN apt-get update \
&& apt-get install -y wget libnss3 libxss1 desktop-file-utils libasound2 ttf-wqy-zenhei libgtk-3-0 libgbm1 libnotify4 \
xdg-utils libsecret-common libsecret-1-0 libindicator3-7 libdbusmenu-glib4 libdbusmenu-gtk3-4 libappindicator3-1 procps \
&& wget https://issuepcdn.baidupcs.com/issue/netdisk/LinuxGuanjia/${BAIDUNETDISK_VER}/baidunetdisk_${BAIDUNETDISK_VER}_amd64.deb \
&& dpkg -i baidunetdisk_${BAIDUNETDISK_VER}_amd64.deb \
&& rm baidunetdisk_${BAIDUNETDISK_VER}_amd64.deb \
xdg-utils libsecret-common libsecret-1-0 libdbusmenu-glib4 libdbusmenu-gtk3-4 procps \
libayatana-indicator3-7 libayatana-appindicator3-1 libayatana-ido3-0.4-0 \
&& if [ "$(uname -m)" = "x86_64" ];then baidunetdisk_arch=amd64;elif [ "$(uname -m)" = "aarch64" ];then baidunetdisk_arch=arm64; fi \
&& if [ "$(uname -m)" = "x86_64" ];then baidunetdisk_ver=${BAIDUNETDISK_VER};elif [ "$(uname -m)" = "aarch64" ];then baidunetdisk_ver=${BAIDUNETDISK_VER_ARM64}; fi \
&& wget https://issuepcdn.baidupcs.com/issue/netdisk/LinuxGuanjia/${baidunetdisk_ver}/baidunetdisk_${baidunetdisk_ver}_${baidunetdisk_arch}.deb \
&& dpkg -i baidunetdisk_${baidunetdisk_ver}_${baidunetdisk_arch}.deb \
&& rm baidunetdisk_${baidunetdisk_ver}_${baidunetdisk_arch}.deb \
&& install_app_icon.sh https://raw.githubusercontent.com/gshang2017/docker/master/baidunetdisk/icon/baidunetdisk.png \
#fix window decorations
&& sed -i 's/normal/desktop/g' /opt/base/etc/jwm/main-window-group.sh \
&& sed -i 's@<decor>no<\/decor>@<decor>yes<\/decor>@g' /opt/base/etc/openbox/rc.xml.template \
#novnc_language
&& mv /opt/noVNC/index.html /opt/noVNC/index.html.en \
#fix dpkg

26
baidunetdisk/Dockerfile.arm64
View File

@ -1,26 +0,0 @@
FROM jlesage/baseimage-gui:debian-10-v4.2.2
ARG BAIDUNETDISK_VER=4.17.7
ENV APP_NAME="Baidunetdisk"
ENV NOVNC_LANGUAGE="zh_Hans"
ENV TZ=Asia/Shanghai
ENV HOME=/config
ENV LC_ALL=C
COPY --chmod=755 root /
COPY --chmod=755 startapp.sh /startapp.sh
RUN apt-get update \
&& apt-get install -y wget libnss3 libxss1 desktop-file-utils libasound2 ttf-wqy-zenhei libgtk-3-0 libgbm1 libnotify4 \
xdg-utils libsecret-common libsecret-1-0 libindicator3-7 libdbusmenu-glib4 libdbusmenu-gtk3-4 libappindicator3-1 procps \
&& wget https://issuepcdn.baidupcs.com/issue/netdisk/LinuxGuanjia/${BAIDUNETDISK_VER}/baidunetdisk_${BAIDUNETDISK_VER}_arm64.deb \
&& dpkg -i baidunetdisk_${BAIDUNETDISK_VER}_arm64.deb \
&& rm baidunetdisk_${BAIDUNETDISK_VER}_arm64.deb \
&& install_app_icon.sh https://raw.githubusercontent.com/gshang2017/docker/master/baidunetdisk/icon/baidunetdisk.png \
#fix window decorations
&& sed -i 's/normal/desktop/g' /opt/base/etc/jwm/main-window-group.sh \
#novnc_language
&& mv /opt/noVNC/index.html /opt/noVNC/index.html.en \
#fix dpkg
&& sed -i '/messagebus/d' /var/lib/dpkg/statoverride

3
baidunetdisk/root/etc/jwm/main-window-selection.jwmrc
View File

@ -1,3 +0,0 @@
<Type>normal</Type>
<Name>baidunetdisk</Name>
<WmName>百度网盘</WmName>

54
baidunetdisk/root/opt/noVNC/index.html.zh
View File

@ -25,8 +25,9 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
<!-- Stylesheets -->
<link rel="stylesheet" href="app/styles/font-awesome.min.css?v=UNIQUE_VERSION">
<link rel="stylesheet" href="app/styles/bootstrap-nightshade.min.css?v=UNIQUE_VERSION">
<link rel="stylesheet" href="app/styles/fontawesome.min.css?v=UNIQUE_VERSION">
<link rel="stylesheet" href="app/styles/solid.min.css?v=UNIQUE_VERSION">
<link rel="stylesheet" href="app/styles/bootstrap.min.css?v=UNIQUE_VERSION">
<link rel="stylesheet" href="app/styles/base.css?v=UNIQUE_VERSION">
<!-- Images that will later appear via CSS -->
@ -44,7 +45,7 @@
<!-- Fatal error message box -->
<div id="noVNC_fallback_error" class="noVNC_center">
<div>
<div>Unexpected error encountered:</div>
<div>遇到未知错误:</div>
<br>
<div id="noVNC_fallback_errormsg"></div>
</div>
@ -59,16 +60,16 @@
<div class="card-header d-flex align-items-center">
<img class="pe-2" style="height: 25px;" src="app/images/icons/master_icon.png?v=UNIQUE_VERSION" id="noVNC_app_logo">
<h5 class="m-0" name="noVNC_app_name">DockerApp</h5>
<div class="ms-auto"><!--<i class="fa fa-unlock-alt fs-4"></i>--></div>
<div class="ms-auto"><a class="btn shadow-none p-0 px-0 noVNC_hidden" href="logout" title="Logout" id="noVNC_logout_button"><i class="fas fa-sign-out-alt fa-fw"></i></a></div>
</div>
<!-- Control bar body -->
<ul class="list-group list-group-flush">
<!-- Action icons -->
<li class="list-group-item" id="noVNC_action_icons_section">
<div class="d-flex justify-content-around align-items-center">
<a class="btn shadow-none p-0" href="#" title="显示键盘" id="noVNC_keyboard_button"><i class="fa fa-keyboard-o fa-fw fs-4"></i></a>
<a class="btn shadow-none p-0 noVNC_hidden" href="#" title="全屏" id="noVNC_fullscreen_button"><i class="fa fa-arrows-alt fa-fw fs-4"></i></a>
<a class="btn shadow-none p-0 noVNC_hidden" href="#" title="拖动" id="noVNC_view_drag_button"><i class="fa fa-hand-rock-o fa-fw fs-4"></i></a>
<div class="d-flex justify-content-center align-items-center">
<a class="btn shadow-none p-0 px-2" href="#" title="显示键盘" id="noVNC_keyboard_button"><i class="fas fa-keyboard fa-fw fa-lg"></i></a>
<a class="btn shadow-none p-0 px-2 noVNC_hidden" href="#" title="全屏" id="noVNC_fullscreen_button"><i class="fas fa-expand fa-fw fa-lg"></i></a>
<a class="btn shadow-none p-0 px-2 noVNC_hidden" href="#" title="拖动" id="noVNC_view_drag_button"><i class="fas fa-hand-rock fa-fw fa-lg"></i></a>
</div>
</li>
<!-- Clipboard -->
@ -80,6 +81,16 @@
<button class="btn btn-outline-secondary" type="button" id="noVNC_clipboard_clear_button">清除</button>
</div>
</li>
<!-- Audio -->
<li class="list-group-item noVNC_hidden" id="noVNC_audio_section">
<label class="custom-accordion-button text-nowrap" data-bs-toggle="collapse" data-bs-target="#audioCollapse">音频</label>
<div class="collapse show" id="audioCollapse">
<div class="d-flex flex-row">
<a class="btn shadow-none p-0 pe-1" href="#" title="Mute/Unmute" id="noVNC_audio_button"><i class="fas fa-volume-mute fa-fw fa-lg" id="noVNC_audio_button_icon"></i></a>
<input type="range" min="0" max="100" value="0" class="form-range flex-grow-1" id="noVNC_setting_audio_volume">
</div>
</div>
</li>
<!-- Settings -->
<li class="list-group-item">
<label class="custom-accordion-button text-nowrap" data-bs-toggle="collapse" data-bs-target="#settingsCollapse">设置</label>
@ -132,6 +143,8 @@
<div class="dots"></div>
</div>
</div>
<!-- Control bar hint -->
<div id="noVNC_control_bar_hint"></div>
</div> <!-- End of Control Bar -->
<!-- Status Dialog -->
@ -142,19 +155,18 @@
<div id="noVNC_credentials_dlg">
<div class="card">
<div class="card-header" name="noVNC_app_name">DockerApp</div>
<div class="card-body">
<h5 class="card-title">需要密码</h5>
<p class="card-text">请输入密码以进行连接.</p>
<form>
<div id="noVNC_username_block" mclass="mb-3">
<input type="text" class="form-control" placeholder="Username" id="noVNC_username_input">
</div>
<div id="noVNC_password_block" class="mb-3">
<input type="password" class="form-control" placeholder="Password" id="noVNC_password_input">
</div>
<button type="submit" id="noVNC_credentials_button" class="btn btn-primary">提交</button>
</form>
</div>
<div class="card-body">
<h5 class="card-title">需要密码</h5>
<p class="card-text">请输入密码以进行连接.</p>
<form>
<div id="noVNC_username_block" mclass="mb-3">
<input type="text" class="form-control" placeholder="Username" id="noVNC_username_input">
</div>
<div id="noVNC_password_block" class="mb-3">
<input type="password" class="form-control" placeholder="Password" id="noVNC_password_input">
</div>
<button type="submit" id="noVNC_credentials_button" class="btn btn-primary">提交</button>
</form>
</div>
</div>
</div>