2023年 04月 04日 星期二 14:39:13 CST test by bot.

.github/workflows/r4se.1-build-env.yml

@@ -1,11 +1,8 @@
 name: R4se Build ENV Docker Image
 
 on:
-  watch:
-    types: started
-  push:
-    branches: [ 'main' ]
-    tags: [ 'v*.*.*' ]
+  schedule:
+    - cron: '46 */8 * * *'
 
 env:
   DOCKERFILE: Dockerfile.r4se.1-build-env
@@ -43,4 +40,3 @@ jobs:
         docker push "${{ steps.build.outputs.image }}:${{ env.TAG }}"
         docker tag "${{ steps.build.outputs.image }}:${{ env.TAG }}" "${{ steps.build.outputs.image }}:${{ env.TAG_FULL }}"
         docker push "${{ steps.build.outputs.image }}:${{ env.TAG_FULL }}"
-        

Dockerfile.r4se.1-build-env

@@ -1,7 +1,7 @@
-FROM ubuntu:jammy-20230308
+FROM ubuntu:22.04
 LABEL maintainer=admin@licsber.site
 
-ENV TARGET_IMAGE_DIRNAME=friendlywrt22.03-docker
+ENV TARGET_IMAGE_DIRNAME=friendlywrt22-docker
 ENV TARGET_FRIENDLYWRT_CONFIG=rockchip-docker
 
 # https://github.com/friendlyarm/Actions-FriendlyWrt/blob/master/.github/workflows/build.yml
@@ -39,8 +39,8 @@ RUN repo init --depth=1 -u https://github.com/friendlyarm/friendlywrt_manifests
     repo sync -c toolchain  --no-clone-bundle
 
 RUN git clone --depth=1 https://github.com/licsber/Dockerfile.git && \
-    bash Dockerfile/openwrt-scripts/r4se_add_packages.sh && \
-    bash Dockerfile/openwrt-scripts/r4se_custom_config.sh && \
+    bash Dockerfile/friendlywrt-scripts/r4se_add_packages.sh && \
+    bash Dockerfile/friendlywrt-scripts/r4se_custom_config.sh && \
     echo '. device/friendlyelec/rk3399/base.mk' >> .current_config.mk && \
     echo "TARGET_IMAGE_DIRNAME=$TARGET_IMAGE_DIRNAME" >> .current_config.mk && \
     echo "TARGET_FRIENDLYWRT_CONFIG=$TARGET_FRIENDLYWRT_CONFIG" >> .current_config.mk && \

friendlywrt-scripts/r4se_add_packages.sh

@@ -45,8 +45,12 @@ echo 'CONFIG_PACKAGE_luci-app-ssr-plus=y' >> configs/rockchip/01-nanopi
 
 # {{ licsber
 echo 'CONFIG_PACKAGE_luci-app-mwan3=y' >> configs/rockchip/01-nanopi
-echo 'CONFIG_PACKAGE_luci-app-openvpn=y' >> configs/rockchip/01-nanopi
+echo 'CONFIG_PACKAGE_luci-app-syncdial=y' >> configs/rockchip/01-nanopi
+
+echo 'CONFIG_PACKAGE_luci-app-openvpn-server=y' >> configs/rockchip/01-nanopi
 echo 'CONFIG_PACKAGE_luci-app-wireguard=y' >> configs/rockchip/01-nanopi
+
 echo 'CONFIG_PACKAGE_ddns-scripts-cloudflare=y' >> configs/rockchip/01-nanopi
+
 echo 'CONFIG_PACKAGE_docker-compose=y' >> configs/rockchip/01-nanopi
 # }}