From 986049ad58252b02299ba05712d30b73955af880 Mon Sep 17 00:00:00 2001
From: licsber <admin@licsber.site>
Date: Tue, 4 Apr 2023 14:39:13 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B4=2004=E6=9C=88=2004=E6=97=A5=20?=
 =?UTF-8?q?=E6=98=9F=E6=9C=9F=E4=BA=8C=2014:39:13=20CST=20test=20by=20bot.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/r4se.1-build-env.yml                    | 8 ++------
 Dockerfile.r4se.1-build-env                               | 8 ++++----
 .../r4se_add_packages.sh                                  | 6 +++++-
 .../r4se_custom_config.sh                                 | 0
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename {openwrt-scripts => friendlywrt-scripts}/r4se_add_packages.sh (92%)
 rename {openwrt-scripts => friendlywrt-scripts}/r4se_custom_config.sh (100%)

diff --git a/.github/workflows/r4se.1-build-env.yml b/.github/workflows/r4se.1-build-env.yml
index 40bda29..48f4982 100644
--- a/.github/workflows/r4se.1-build-env.yml
+++ b/.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 }}"
-        
diff --git a/Dockerfile.r4se.1-build-env b/Dockerfile.r4se.1-build-env
index 6eddab8..2be6fcf 100644
--- a/Dockerfile.r4se.1-build-env
+++ b/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 && \
diff --git a/openwrt-scripts/r4se_add_packages.sh b/friendlywrt-scripts/r4se_add_packages.sh
similarity index 92%
rename from openwrt-scripts/r4se_add_packages.sh
rename to friendlywrt-scripts/r4se_add_packages.sh
index da62954..a1c3ba8 100644
--- a/openwrt-scripts/r4se_add_packages.sh
+++ b/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
 # }}
diff --git a/openwrt-scripts/r4se_custom_config.sh b/friendlywrt-scripts/r4se_custom_config.sh
similarity index 100%
rename from openwrt-scripts/r4se_custom_config.sh
rename to friendlywrt-scripts/r4se_custom_config.sh