Skip to content

rustdesk #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 102 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
98963f8
modified: images.txt
Tyro-yxk Jun 9, 2024
a95f55c
docker页面管理
Tyro-yxk Jun 9, 2024
18c2f9c
modified: images.txt
Tyro-yxk Jun 9, 2024
f3af0a4
modified: images.txt
Tyro-yxk Jun 9, 2024
0cad71a
jellyfin
Tyro-yxk Jun 9, 2024
80c4808
tinymediamanager
Tyro-yxk Jun 9, 2024
3f11e3b
tinymediamanager
Tyro-yxk Jun 9, 2024
4b11ef6
测试
Tyro-yxk Jun 9, 2024
02beaa0
alist,nas-tools
Tyro-yxk Jun 10, 2024
a8919e8
xiaoyaliu
Tyro-yxk Jun 10, 2024
114cf13
hahahahaha
Tyro-yxk Jun 10, 2024
e19dc6e
nodered
Tyro-yxk Jun 10, 2024
e79381d
test
Tyro-yxk Jun 10, 2024
9031caa
test
Tyro-yxk Jun 10, 2024
024d151
a
Tyro-yxk Jun 10, 2024
db97880
b
Tyro-yxk Jun 10, 2024
efe60e4
nas-tools
Tyro-yxk Jun 10, 2024
6c850f8
chinesesubfinder
Tyro-yxk Jun 10, 2024
981a0cd
xiaoya
Tyro-yxk Jun 10, 2024
43adb17
iemofun
Tyro-yxk Jun 10, 2024
e24509f
chinesesubfinder
Tyro-yxk Jun 10, 2024
78a743b
ombi
Tyro-yxk Jun 10, 2024
bfec9e1
jellyseerr
Tyro-yxk Jun 10, 2024
9a9d976
overseerr
Tyro-yxk Jun 10, 2024
617c01d
prowlarr
Tyro-yxk Jun 10, 2024
7ade130
test
Tyro-yxk Jun 10, 2024
d778723
line
Tyro-yxk Jun 10, 2024
6b20fda
test
Tyro-yxk Jun 10, 2024
76b7c8a
image
Tyro-yxk Jun 10, 2024
4096681
a
Tyro-yxk Jun 10, 2024
56beb8f
aa
Tyro-yxk Jun 10, 2024
39388e8
asas
Tyro-yxk Jun 10, 2024
2905359
acac
Tyro-yxk Jun 10, 2024
a99cd75
aacc
Tyro-yxk Jun 10, 2024
774e0ce
adad
Tyro-yxk Jun 10, 2024
a88f949
qqq
Tyro-yxk Jun 10, 2024
d5fe156
iemo_amd64
Tyro-yxk Jun 10, 2024
e84d9e1
ombi
Tyro-yxk Jun 10, 2024
8df8dfa
overseerr
Tyro-yxk Jun 10, 2024
d371ef2
jellyseerr
Tyro-yxk Jun 10, 2024
dbaf10e
prowlarr
Tyro-yxk Jun 10, 2024
4f8eedd
xunlei
Tyro-yxk Jun 10, 2024
935afd0
ubuntu-novnc
Tyro-yxk Jun 10, 2024
197ff9a
nastools
Tyro-yxk Jun 10, 2024
f0f3d26
epicgames
Tyro-yxk Jun 10, 2024
f14ab67
nas-tools
Tyro-yxk Jun 10, 2024
679759d
xiaoya-tvbox
Tyro-yxk Jun 12, 2024
4c84f23
Update images.txt
Tyro-yxk Jun 12, 2024
f56abe7
Update images.txt
Tyro-yxk Jun 12, 2024
ea10aea
Merge branch 'main' of https://github.com/Tyro-yxk/docker_image_pusher
Tyro-yxk Jun 12, 2024
0883a77
test
Tyro-yxk Jun 12, 2024
b3ac8c4
alist
Tyro-yxk Jun 12, 2024
085de07
xiaoyaliu
Tyro-yxk Jun 12, 2024
58caca7
test
Tyro-yxk Jun 12, 2024
0512918
alist
Tyro-yxk Jun 12, 2024
9868e34
All
Tyro-yxk Jun 12, 2024
da36322
main
Tyro-yxk Jun 12, 2024
feb0219
all
Tyro-yxk Jun 12, 2024
790e49c
All
Tyro-yxk Jun 12, 2024
b684e30
test
Tyro-yxk Jun 12, 2024
daf43bf
main
Tyro-yxk Jun 12, 2024
0a27b8e
kao
Tyro-yxk Jun 12, 2024
0159d5e
tvbox
Tyro-yxk Jun 12, 2024
8c2ffef
yang
Tyro-yxk Jun 12, 2024
32477b1
jellyfin
Tyro-yxk Jun 12, 2024
4501eb7
metadata
Tyro-yxk Jun 12, 2024
75af3c2
xiaoya
Tyro-yxk Jun 12, 2024
5b2b4ea
alist
Tyro-yxk Jun 12, 2024
584962b
alist
Tyro-yxk Jun 12, 2024
9d48c96
modified: test.txt
Tyro-yxk Jun 12, 2024
9120793
xiaoya
Tyro-yxk Jun 12, 2024
d35a2d0
1111111
Tyro-yxk Jun 13, 2024
a1d1f1a
alpine
Tyro-yxk Jun 13, 2024
a3a503a
xiaoya
Tyro-yxk Jun 13, 2024
f938a6e
tianjia
Tyro-yxk Aug 6, 2024
708c013
删除ljdyw_ubuntu-novnc
Tyro-yxk Aug 6, 2024
c603193
Update images.txt
Tyro-yxk Aug 6, 2024
fb8531c
Merge branch 'main' of https://github.com/Tyro-yxk/docker_image_pusher
Tyro-yxk Aug 6, 2024
eab73bd
qinglong
Tyro-yxk Aug 6, 2024
ba3a9d8
滚滚滚
Tyro-yxk Aug 6, 2024
13dd20c
deelete
Tyro-yxk Aug 6, 2024
37439ec
qbittorrent
Tyro-yxk Aug 6, 2024
d120688
tetetetete
Tyro-yxk Aug 6, 2024
d29e1ae
qinglong
Tyro-yxk Aug 6, 2024
3492943
qinglong
Tyro-yxk Aug 6, 2024
881dd5c
epicgames
Tyro-yxk Aug 6, 2024
ca2c0ea
空行
Tyro-yxk Aug 6, 2024
23b966d
青龙
Tyro-yxk Aug 6, 2024
71afbe7
nastools
Tyro-yxk Oct 1, 2024
8ee1c55
diluka
Tyro-yxk Oct 1, 2024
17bfe16
zonty/nas-tools
Tyro-yxk Oct 1, 2024
5315490
johngong/qbittorrent:4.6.0-4.6.0.10
Tyro-yxk Oct 1, 2024
28917a5
ljnpng
Tyro-yxk Oct 18, 2024
dff9ee8
filesite/machete
Tyro-yxk Nov 22, 2024
9b71452
filesite/machete
Tyro-yxk Nov 22, 2024
ef71ab9
aria
Tyro-yxk Dec 6, 2024
1abee90
tinymediamanager
Tyro-yxk Dec 6, 2024
aa2893c
ncarlier/mqtt
Tyro-yxk Jan 1, 2025
c9ca91d
ncarlier/mqtt
Tyro-yxk Jan 1, 2025
8ddb6c3
broadlinkac/broadlink_ac_mqtt
Tyro-yxk Jan 1, 2025
9cd71f2
rustdesk
Tyro-yxk Apr 28, 2025
1a333ef
rustdesk
Tyro-yxk Apr 28, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 50 additions & 57 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,48 @@
# name: Docker

# on:
# workflow_dispatch:
# push:
# branches: [ main ]


# env:
# ALIYUN_REGISTRY: "${{ secrets.ALIYUN_REGISTRY }}"
# ALIYUN_NAME_SPACE: "${{ secrets.ALIYUN_NAME_SPACE }}"
# ALIYUN_REGISTRY_USER: "${{ secrets.ALIYUN_REGISTRY_USER }}"
# ALIYUN_REGISTRY_PASSWORD: "${{ secrets.ALIYUN_REGISTRY_PASSWORD }}"

# jobs:

# build:
# name: Pull
# runs-on: ubuntu-latest
# steps:
# - name: Setup Docker buildx
# uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf

# - name: Check out code
# uses: actions/checkout@v2

# - name: Build and push image Aliyun
# run: |
# docker login -u $ALIYUN_REGISTRY_USER -p $ALIYUN_REGISTRY_PASSWORD $ALIYUN_REGISTRY
# while IFS= read -r line; do
# [[ -z "$line" ]] && continue
# echo "docker pull $line"
# docker pull $line
# # 获取镜像的完整名称,例如kasmweb/nginx:1.25.3(命名空间/镜像名:版本号)
# image=$(echo "$line" | awk '{print $NF}')
# # 获取 镜像名:版本号 例如nginx:1.25.3
# image_name_tag=$(echo "$image" | tr '/' '-' | awk '{print $NF}')
# new_image="$ALIYUN_REGISTRY/$ALIYUN_NAME_SPACE/$image_name_tag"
# echo "docker tag $image $new_image"
# docker tag $image $new_image
# echo "docker push $new_image"
# docker push $new_image

# done < images.txt

name: Docker

on:
Expand Down Expand Up @@ -27,46 +72,6 @@ jobs:
- name: Build and push image Aliyun
run: |
docker login -u $ALIYUN_REGISTRY_USER -p $ALIYUN_REGISTRY_PASSWORD $ALIYUN_REGISTRY
# 数据预处理,判断镜像是否重名
declare -A duplicate_images
declare -A temp_map
while IFS= read -r line; do
# 忽略空行与注释
[[ -z "$line" ]] && continue
if echo "$line" | grep -q '^\s*#'; then
continue
fi

# 获取镜像的完整名称,例如kasmweb/nginx:1.25.3(命名空间/镜像名:版本号)
image=$(echo "$line" | awk '{print $NF}')
# 将@sha256:等字符删除
image="${image%%@*}"
echo "image $image"
# 获取镜像名:版本号 例如nginx:1.25.3
image_name_tag=$(echo "$image" | awk -F'/' '{print $NF}')
echo "image_name_tag $image_name_tag"
# 获取命名空间 例如kasmweb, 这里有种特殊情况 docker.io/nginx,把docker.io当成命名空间,也OK
name_space=$(echo "$image" | awk -F'/' '{if (NF==3) print $2; else if (NF==2) print $1; else print ""}')
echo "name_space: $name_space"
# 这里不要是空值影响判断
name_space="${name_space}_"
# 获取镜像名例如nginx
image_name=$(echo "$image_name_tag" | awk -F':' '{print $1}')
echo "image_name: $image_name"

# 如果镜像存在于数组中,则添加temp_map
if [[ -n "${temp_map[$image_name]}" ]]; then
# 如果temp_map已经存在镜像名,判断是不是同一命名空间
if [[ "${temp_map[$image_name]}" != $name_space ]]; then
echo "duplicate image name: $image_name"
duplicate_images[$image_name]="true"
fi
else
# 存镜像的命名空间
temp_map[$image_name]=$name_space
fi
done < images.txt


while IFS= read -r line; do
# 忽略空行与注释
Expand All @@ -86,30 +91,18 @@ jobs:
platform_prefix="${platform//\//_}_"
fi
echo "platform_prefix is $platform_prefix"

# 获取镜像的完整名称,例如kasmweb/nginx:1.25.3(命名空间/镜像名:版本号)
image=$(echo "$line" | awk '{print $NF}')

# 获取 镜像名:版本号 例如nginx:1.25.3
image_name_tag=$(echo "$image" | awk -F'/' '{print $NF}')
# 获取命名空间 例如kasmweb 这里有种特殊情况 docker.io/nginx,把docker.io当成命名空间,也OK
name_space=$(echo "$image" | awk -F'/' '{if (NF==3) print $2; else if (NF==2) print $1; else print ""}')
# 获取镜像名例 例如nginx
image_name=$(echo "$image_name_tag" | awk -F':' '{print $1}')

name_space_prefix=""
# 如果镜像名重名
if [[ -n "${duplicate_images[$image_name]}" ]]; then
#如果命名空间非空,将命名空间加到前缀
if [[ -n "${name_space}" ]]; then
name_space_prefix="${name_space}_"
fi
fi
image_name_tag=$(echo "$image" | tr '/' '_' | awk '{print $NF}')


# 将@sha256:等字符删除
image_name_tag="${image_name_tag%%@*}"
new_image="$ALIYUN_REGISTRY/$ALIYUN_NAME_SPACE/$platform_prefix$name_space_prefix$image_name_tag"
new_image="$ALIYUN_REGISTRY/$ALIYUN_NAME_SPACE/$image_name_tag"
echo "docker tag $image $new_image"
docker tag $image $new_image
echo "docker push $new_image"
docker push $new_image
done < images.txt
done < images.txt
7 changes: 1 addition & 6 deletions images.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
nginx
#支持私库
k8s.gcr.io/kube-state-metrics/kube-state-metrics:v2.0.0
xhofe/alist:latest
#支持指定架构
--platform=linux/arm64 xiaoyaliu/alist
lejianwen/rustdesk-server-s6:latest
51 changes: 51 additions & 0 deletions test.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
6053537/portainer-ce:latest
xhongc/music_tag_web
jellyfin/jellyfin:latest
dzhuang/tinymediamanager:latest
xhofe/alist
diluka/nas-tools:2.9.1
zonty/nas-tools:2.9.1
allanpk716/chinesesubfinder:latest-lite
linuxserver/jackett:latest
linuxserver/qbittorrent:latest
xiaoyaliu/alist:latest
iemofun/iemo_amd64:v3.1.3
homeassistant/home-assistant
linuxserver/radarr
linuxserver/sonarr
diygod/rsshub
linuxserver/ombi
linuxserver/bazarr
linuxserver/plex
linuxserver/overseerr
fallenbagel/jellyseerr
emby/embyserver
linuxserver/prowlarr
flaresolverr/flaresolverr
cnk3x/xunlei
ljdyw/ubuntu-novnc
nastools/nas-tools
linuxserver/transmission
esphome/esphome
whyour/qinglong:latest
ghcr.io/vogler/free-games-claimer
gitlab/gitlab-ee
twang2218/gitlab-ce-zh
johngong/qbittorrent
nyanmisaka/jellyfin:latest
oldiy/transmission-twc
emqx/emqx
nodered/node-red
deluan/navidrome
registry
konradkleine/docker-registry-frontend:v2
registry:2
haroldli/xiaoya-tvbox:latest
ghcr.io/monlor/xiaoya-metadata
ghcr.io/monlor/xiaoya-embyserver
ghcr.io/monlor/xiaoya-jellyfin:latest
ghcr.io/monlor/xiaoya-alist
luminoleon/epicgames-claimer
johngong/qbittorrent:4.6.0-4.6.0.10
ljnpng/nastools:2.9.0
filesite/machete