- 移除apps中package.json的version字段 - 添加DOCKER_API_VERSION环境变量 - 改进Docker安装流程,使用官方源安装新版CLI和Buildx插件
This commit is contained in:
parent
72bf4fee7c
commit
4ae7ed783f
@ -19,6 +19,7 @@ env:
|
|||||||
TELEGRAM_CHAT_ID: "-4940243803"
|
TELEGRAM_CHAT_ID: "-4940243803"
|
||||||
DOCKER_REGISTRY: registry.kxsw.us
|
DOCKER_REGISTRY: registry.kxsw.us
|
||||||
DOCKER_BUILDKIT: 1
|
DOCKER_BUILDKIT: 1
|
||||||
|
DOCKER_API_VERSION: "1.44"
|
||||||
# Host SSH - 根据分支动态选择
|
# Host SSH - 根据分支动态选择
|
||||||
SSH_HOST: ${{ github.ref_name == 'main' && vars.PRO_SSH_HOST || (github.ref_name == 'dev' && vars.DEV_SSH_HOST || vars.PRO_SSH_HOST) }}
|
SSH_HOST: ${{ github.ref_name == 'main' && vars.PRO_SSH_HOST || (github.ref_name == 'dev' && vars.DEV_SSH_HOST || vars.PRO_SSH_HOST) }}
|
||||||
SSH_PORT: ${{ github.ref_name == 'main' && vars.PRO_SSH_PORT || (github.ref_name == 'dev' && vars.DEV_SSH_PORT || vars.PRO_SSH_PORT) }}
|
SSH_PORT: ${{ github.ref_name == 'main' && vars.PRO_SSH_PORT || (github.ref_name == 'dev' && vars.DEV_SSH_PORT || vars.PRO_SSH_PORT) }}
|
||||||
@ -97,7 +98,15 @@ jobs:
|
|||||||
echo "Still waiting for locks..."; sleep 5
|
echo "Still waiting for locks..."; sleep 5
|
||||||
done
|
done
|
||||||
apt-get update -y -o Dpkg::Lock::Timeout=600
|
apt-get update -y -o Dpkg::Lock::Timeout=600
|
||||||
apt-get install -y -o Dpkg::Lock::Timeout=600 jq curl ca-certificates docker.io
|
# 基础工具和GPG
|
||||||
|
apt-get install -y -o Dpkg::Lock::Timeout=600 jq curl ca-certificates gnupg
|
||||||
|
# 配置Docker官方源,安装新版CLI与Buildx插件(支持 API 1.44+)
|
||||||
|
install -m 0755 -d /etc/apt/keyrings
|
||||||
|
curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /etc/apt/keyrings/docker.gpg
|
||||||
|
chmod a+r /etc/apt/keyrings/docker.gpg
|
||||||
|
echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/debian $(. /etc/os-release && echo $VERSION_CODENAME) stable" > /etc/apt/sources.list.d/docker.list
|
||||||
|
apt-get update -y -o Dpkg::Lock::Timeout=600
|
||||||
|
apt-get install -y -o Dpkg::Lock::Timeout=600 docker-ce-cli docker-buildx-plugin
|
||||||
docker --version
|
docker --version
|
||||||
jq --version
|
jq --version
|
||||||
curl --version
|
curl --version
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name": "ppanel-admin-web",
|
"name": "ppanel-admin-web",
|
||||||
"version": "1.3.1",
|
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "next build",
|
"build": "next build",
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
{
|
{
|
||||||
"name": "ppanel-user-web",
|
"name": "ppanel-user-web",
|
||||||
"version": "1.3.1",
|
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"build": "next build",
|
"build": "next build",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user