kiddin9 4 лет назад
Родитель
Сommit
009e3b5342
5 измененных файлов с 37 добавлено и 2 удалено
  1. 30 0
      .github/workflows/Openwrt-AutoBuild.yml
  2. 5 0
      Dockerfile
  3. 1 1
      README.md
  4. 1 0
      devices/common/.config
  5. 0 1
      devices/x86_64/.config

+ 30 - 0
.github/workflows/Openwrt-AutoBuild.yml

@@ -19,6 +19,8 @@ env:
   TELEGRAM_TOKEN: ${{ secrets.TELEGRAM_TOKEN }}
   TELEGRAM_CHAT_ID: ${{ secrets.TELEGRAM_CHAT_ID }}
   SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
+  DOCKER_ID: ${{ secrets.DOCKER_ID }}
+  DOCKER_PASSWD: ${{ secrets.DOCKER_PASSWD }}
   TZ: Asia/Shanghai
 
 jobs:
@@ -60,6 +62,11 @@ jobs:
         echo "UPLOAD_FIRMWARE_FOR_RELEASE=${UPLOAD_FIRMWARE_FOR_RELEASE}" >> $GITHUB_ENV
         echo "UPLOAD_FIRMWARE_TO_COWTRANSFER=${UPLOAD_FIRMWARE_TO_COWTRANSFER}" >> $GITHUB_ENV
         echo "UPLOAD_FIRMWARE_TO_WETRANSFER=${UPLOAD_FIRMWARE_TO_WETRANSFER}" >> $GITHUB_ENV
+        if [ ${{matrix.target}} == "x86_64" ]; then
+            echo "ARCH=linux/amd64" >> $GITHUB_ENV
+        elif [[ ${{matrix.target}} =~ (Rpi-4B|nanopi-r2s|nanopi-r4s) ]]; then
+            echo "ARCH=linux/arm64" >> $GITHUB_ENV
+        fi
 
     - name: Trigger Packages Update
       run: |
@@ -277,7 +284,30 @@ jobs:
         name: ${{ env.date2 }} ${{matrix.target}} ${{ env.EMOJI }}
         tag_name: ${{ env.date }}_${{matrix.target}}
         body_path: release.txt
+      
+    - name: Set Up Docker Buildx
+      uses: docker/setup-buildx-action@master
+      if: env.DOCKER_ID && env.DOCKER_PASSWD
+
+    - name: Login To DockerHub
+      uses: docker/login-action@master
+      if: env.DOCKER_ID && env.DOCKER_PASSWD
+      with:
+        username: ${{ secrets.DOCKER_ID }}
+        password: ${{ secrets.DOCKER_PASSWD }}
         
+    - name: Build and push docker image
+      uses: docker/build-push-action@master
+      continue-on-error: true
+      if: env.DOCKER_ID && env.DOCKER_PASSWD
+      with:
+        platforms: ${{ env.ARCH }}
+        file: Dockerfile
+        context: .
+        push: true
+        tags: |
+          ${{ secrets.DOCKER_ID }}/openwrt-nginx:${{ matrix.target }}
+    
     - name: WeChat notification
       continue-on-error: true
       if: env.SCKEY

+ 5 - 0
Dockerfile

@@ -0,0 +1,5 @@
+FROM scratch
+
+MAINTAINER Kiddin9 "https://github.com/kiddin9/OpenWrt_x86-r2s-r4s"
+
+ADD openwrt/bin/targets/*/*/*rootfs*.tar.gz /

+ 1 - 1
README.md

@@ -1,4 +1,4 @@
-# Actions OpenWrt Snapshot
+# OpenWrt x86_64 NanoPi-R2S R4S Raspberry-Pi-4B
 [1]: https://img.shields.io/badge/license-GPLV2-brightgreen.svg
 [2]: /LICENSE
 [3]: https://img.shields.io/badge/PRs-welcome-brightgreen.svg

+ 1 - 0
devices/common/.config

@@ -2,6 +2,7 @@
 CONFIG_GRUB_TIMEOUT="0"
 CONFIG_SIGNATURE_CHECK=n
 CONFIG_TARGET_ROOTFS_EXT4FS=n
+CONFIG_TARGET_ROOTFS_TARGZ=y
 CONFIG_LUCI_CSSTIDY=n
 CONFIG_GRUB_CONSOLE=n
 CONFIG_SIGNED_PACKAGES=n

+ 0 - 1
devices/x86_64/.config

@@ -8,7 +8,6 @@ CONFIG_TARGET_x86_64=y
 CONFIG_GRUB_IMAGES=y
 CONFIG_EFI_IMAGES=y
 CONFIG_VMDK_IMAGES=n
-CONFIG_TARGET_ROOTFS_TARGZ=n
 
 # 其他需要安装的软件包:
 CONFIG_PACKAGE_luci-proto-bonding=y