Add ImageBuilder support (#569)

.github/workflows/R2C-OpenWrt.yml

@@ -115,6 +115,30 @@ jobs:
         cd openwrt && make -j1 V=s
     - name: Print Disk Space After
       run: df -h
+    - name: Prepare ImageBuilder Docker image files
+      run: |
+        /bin/bash 08_prepare_ib.sh
+        image_base="${{ github.repository }}-imagebuilder:R2C-${{ env.latest_release }}"
+        image_base=$(echo $image_base | awk '{print tolower($0)}')
+        versioned_image="${image_base}-$(date +%Y-%m-%d)"
+        latest_image="${image_base}-latest"
+        echo "versioned_image=${versioned_image}" >>$GITHUB_ENV
+        echo "latest_image=${latest_image}" >>$GITHUB_ENV
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Build and release ImageBuilder Docker images
+      uses: docker/build-push-action@v4
+      with:
+        platforms: linux/amd64
+        context: ./IMAGEBUILDER
+        tags: |
+          ghcr.io/${{ env.versioned_image }}
+          ghcr.io/${{ env.latest_image }}
+        push: true
     - name: Organize files
       id: organize
       run: |

.github/workflows/R2S-OpenWrt.yml

@@ -115,6 +115,30 @@ jobs:
         cd openwrt && make -j1 V=s
     - name: Print Disk Space After
       run: df -h
+    - name: Prepare ImageBuilder Docker image files
+      run: |
+        /bin/bash 08_prepare_ib.sh
+        image_base="${{ github.repository }}-imagebuilder:R2S-${{ env.latest_release }}"
+        image_base=$(echo $image_base | awk '{print tolower($0)}')
+        versioned_image="${image_base}-$(date +%Y-%m-%d)"
+        latest_image="${image_base}-latest"
+        echo "versioned_image=${versioned_image}" >>$GITHUB_ENV
+        echo "latest_image=${latest_image}" >>$GITHUB_ENV
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Build and release ImageBuilder Docker images
+      uses: docker/build-push-action@v4
+      with:
+        platforms: linux/amd64
+        context: ./IMAGEBUILDER
+        tags: |
+          ghcr.io/${{ env.versioned_image }}
+          ghcr.io/${{ env.latest_image }}
+        push: true
     - name: Organize files
       id: organize
       run: |

.github/workflows/R4S-OpenWrt.yml

@@ -115,6 +115,30 @@ jobs:
         cd openwrt && make -j1 V=s
     - name: Print Disk Space After
       run: df -h
+    - name: Prepare ImageBuilder Docker image files
+      run: |
+        /bin/bash 08_prepare_ib.sh
+        image_base="${{ github.repository }}-imagebuilder:R4S-${{ env.latest_release }}"
+        image_base=$(echo $image_base | awk '{print tolower($0)}')
+        versioned_image="${image_base}-$(date +%Y-%m-%d)"
+        latest_image="${image_base}-latest"
+        echo "versioned_image=${versioned_image}" >>$GITHUB_ENV
+        echo "latest_image=${latest_image}" >>$GITHUB_ENV
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Build and release ImageBuilder Docker images
+      uses: docker/build-push-action@v4
+      with:
+        platforms: linux/amd64
+        context: ./IMAGEBUILDER
+        tags: |
+          ghcr.io/${{ env.versioned_image }}
+          ghcr.io/${{ env.latest_image }}
+        push: true
     - name: Organize files
       id: organize
       run: |

.github/workflows/X86-OpenWrt.yml

@@ -115,6 +115,31 @@ jobs:
         cd openwrt && make -j1 V=s
     - name: Print Disk Space After
       run: df -h
+    - name: Prepare ImageBuilder Docker image files
+      run: |
+        /bin/bash 08_prepare_ib.sh
+        image_base="${{ github.repository }}-imagebuilder:X86-${{ env.latest_release }}"
+        image_base=$(echo $image_base | awk '{print tolower($0)}')
+        versioned_image="${image_base}-$(date +%Y-%m-%d)"
+        latest_image="${image_base}-latest"
+        echo "versioned_image=${versioned_image}" >>$GITHUB_ENV
+        echo "latest_image=${latest_image}" >>$GITHUB_ENV
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.GITHUB_TOKEN }}
+    - name: Build and release ImageBuilder Docker images
+      uses: docker/build-push-action@v4
+      with:
+        platforms: linux/amd64
+        context: ./IMAGEBUILDER
+        tags: |
+          ghcr.io/${{ env.versioned_image }}
+          ghcr.io/${{ env.latest_image }}
+        push: true
+
     - name: Organize files
       id: organize
       run: |

IMAGEBUILDER/Dockerfile

@@ -0,0 +1,15 @@
+FROM ghcr.io/openwrt/buildbot/buildworker-v3.8.0:latest
+
+ARG USER=buildbot
+ARG WORKDIR=/builder/
+ARG CMD="/bin/bash"
+
+USER $USER
+WORKDIR $WORKDIR
+
+COPY --chown=$USER:$USER ./imagebuilder/ ./
+
+ENTRYPOINT [ ]
+
+# required to have CMD as ENV to be executed
+ENV CMD_ENV=${CMD}

SCRIPTS/08_prepare_ib.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+file=$(find . | grep "imagebuilder-.*x86_64.tar.xz" | head -n 1)
+cp $file ./IMAGEBUILDER/imagebuilder.tar.xz
+cd IMAGEBUILDER
+tar -xvf imagebuilder.tar.xz
+mv $(basename $file .tar.xz) imagebuilder
+rm -rf imagebuilder.tar.xz

SEED/R2C/config.seed

@@ -1,4 +1,5 @@
 ### INITIALIZATION ###
+CONFIG_IB=y
 CONFIG_TARGET_rockchip=y
 CONFIG_TARGET_rockchip_armv8=y
 CONFIG_TARGET_rockchip_armv8_DEVICE_friendlyarm_nanopi-r2c=y

SEED/R2S/config.seed

@@ -1,4 +1,5 @@
 ### INITIALIZATION ###
+CONFIG_IB=y
 CONFIG_TARGET_rockchip=y
 CONFIG_TARGET_rockchip_armv8=y
 CONFIG_TARGET_rockchip_armv8_DEVICE_friendlyarm_nanopi-r2s=y

SEED/R4S/config.seed

@@ -1,4 +1,5 @@
 ### INITIALIZATION ###
+CONFIG_IB=y
 CONFIG_TARGET_rockchip=y
 CONFIG_TARGET_rockchip_armv8=y
 CONFIG_TARGET_rockchip_armv8_DEVICE_friendlyarm_nanopi-r4s=y

SEED/X86/config.seed

@@ -1,4 +1,5 @@
 ### INITIALIZATION ###
+CONFIG_IB=y
 CONFIG_TARGET_x86=y
 CONFIG_TARGET_x86_64=y
 CONFIG_TARGET_x86_64_DEVICE_generic=y