diff --git a/.github/workflows/openwrt-lede-x86.yml b/.github/workflows/openwrt-lede-x86.yml index f07a74b..db0610f 100644 --- a/.github/workflows/openwrt-lede-x86.yml +++ b/.github/workflows/openwrt-lede-x86.yml @@ -24,12 +24,14 @@ jobs: run: | docker rmi `docker images -q` sudo -E rm -rf /usr/share/dotnet /etc/mysql /etc/php /etc/apt/sources.list.d /usr/local/lib/android + sudo -E rm -rf /usr/local/share/boost "$AGENT_TOOLSDIRECTORY" /opt/ghc sudo -E apt update -y sudo -E apt -y purge azure-cli* ghc* zulu* llvm* firefox google* dotnet* powershell* openjdk* mysql* php* mongodb* dotnet* snap* sudo -E systemctl daemon-reload sudo -E apt -y autoremove --purge sudo -E apt clean sudo -E timedatectl set-timezone "Asia/Shanghai" + df -h - name: Checkout V4 uses: actions/checkout@v4 @@ -49,7 +51,7 @@ jobs: echo "image=$IMAGE" >> $GITHUB_OUTPUT cd `dirname "${{ env.DOCKERFILE }}"` docker build -t "$IMAGE:${{ env.TAG }}" --file `basename ${{ env.DOCKERFILE }}` . - + - name: Push Image run: | docker push "${{ steps.build.outputs.image }}:${{ env.TAG }}" diff --git a/.github/workflows/self-win-openwrt-lede-x86.yml b/.github/workflows/self-win-openwrt-lede-x86.yml index e8432dd..c41c48d 100644 --- a/.github/workflows/self-win-openwrt-lede-x86.yml +++ b/.github/workflows/self-win-openwrt-lede-x86.yml @@ -14,7 +14,7 @@ env: jobs: build: - runs-on: self-hosted + runs-on: [self-hosted, Windows] steps: - name: Checkout V4 uses: actions/checkout@v4 diff --git a/.github/workflows/self-win-reboot.yml b/.github/workflows/self-win-reboot.yml index 20ba2a2..f46de63 100644 --- a/.github/workflows/self-win-reboot.yml +++ b/.github/workflows/self-win-reboot.yml @@ -5,7 +5,7 @@ on: jobs: build: - runs-on: self-hosted + runs-on: [self-hosted, Windows] steps: - name: Trigger Reboot run: | diff --git a/openwrt/lede/env/Dockerfile.openwrt-lede-env b/openwrt/lede/env/Dockerfile.openwrt-lede-env index a1ea6ff..408d674 100644 --- a/openwrt/lede/env/Dockerfile.openwrt-lede-env +++ b/openwrt/lede/env/Dockerfile.openwrt-lede-env @@ -1,5 +1,5 @@ FROM docker.io/debian:12 -LABEL org.opencontainers.image.authors="licsber" +LABEL org.opencontainers.image.authors='licsber' RUN lscpu && \ apt update > /dev/null && \ @@ -8,11 +8,11 @@ RUN lscpu && \ libncurses-dev libssl-dev python3-distutils \ libelf-dev python3-pyelftools \ rsync unzip zlib1g-dev file wget \ - qemu-utils screenfetch neofetch \ + qemu-utils screenfetch \ > /dev/null && \ apt clean > /dev/null && \ rm -rf /var/lib/apt/list/* && \ - screenfetch && neofetch + screenfetch RUN useradd -c 'licsber user' -m -d /home/licsber -s /bin/bash licsber RUN usermod -aG sudo licsber diff --git a/openwrt/lede/x86/Dockerfile.openwrt-lede-x86 b/openwrt/lede/x86/Dockerfile.openwrt-lede-x86 index e0f1ee0..41a4280 100644 --- a/openwrt/lede/x86/Dockerfile.openwrt-lede-x86 +++ b/openwrt/lede/x86/Dockerfile.openwrt-lede-x86 @@ -1,5 +1,5 @@ FROM registry.cn-beijing.aliyuncs.com/licsber/github:openwrt-lede-env -LABEL org.opencontainers.image.authors="licsber" +LABEL org.opencontainers.image.authors='licsber' USER licsber WORKDIR /home/licsber/lede