From 89dbe9d7472078900f4ece27425a5fcc32290f6e Mon Sep 17 00:00:00 2001
From: licsber <admin@licsber.site>
Date: Wed, 13 Sep 2023 04:25:27 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B4=209=E6=9C=8813=E6=97=A5=20?=
 =?UTF-8?q?=E6=98=9F=E6=9C=9F=E4=B8=89=2004=E6=97=B625=E5=88=8627=E7=A7=92?=
 =?UTF-8?q?=20CST=20test=20by=20bot.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...enwrt.lede.r4se.1-build-env.yml => openwrt-lede-env.yml} | 6 +++---
 .../Dockerfile.openwrt-lede-env}                            | 2 +-
 .../build.openwrt-lede-env.sh}                              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename .github/workflows/{openwrt.lede.r4se.1-build-env.yml => openwrt-lede-env.yml} (88%)
 rename openwrt/lede/{r4se/Dockerfile.1-build-env => base/Dockerfile.openwrt-lede-env} (86%)
 rename openwrt/lede/{r4se/build-r4se.1-build-env.sh => base/build.openwrt-lede-env.sh} (92%)

diff --git a/.github/workflows/openwrt.lede.r4se.1-build-env.yml b/.github/workflows/openwrt-lede-env.yml
similarity index 88%
rename from .github/workflows/openwrt.lede.r4se.1-build-env.yml
rename to .github/workflows/openwrt-lede-env.yml
index df5db39..fa9785a 100644
--- a/.github/workflows/openwrt.lede.r4se.1-build-env.yml
+++ b/.github/workflows/openwrt-lede-env.yml
@@ -7,13 +7,13 @@ on:
     - cron: '46 */8 * * *'
 
 env:
-  DOCKERFILE: openwrt/lede/r4se/Dockerfile.1-build-env
+  DOCKERFILE: openwrt/lede/base/Dockerfile.openwrt-lede-env
   REGION: cn-beijing
   REGISTRY: registry.cn-beijing.aliyuncs.com
   NAMESPACE: licsber
   REPOSITORY: github
-  TAG: openwrt.lede.r4se.1-build-env
-  TAG_FULL: openwrt.lede.r4se.1-build-env-${{ github.sha }}
+  TAG: openwrt-lede-env
+  TAG_FULL: openwrt-lede-env-${{ github.sha }}
 
 jobs:
   build:
diff --git a/openwrt/lede/r4se/Dockerfile.1-build-env b/openwrt/lede/base/Dockerfile.openwrt-lede-env
similarity index 86%
rename from openwrt/lede/r4se/Dockerfile.1-build-env
rename to openwrt/lede/base/Dockerfile.openwrt-lede-env
index d4bb063..a6533a5 100644
--- a/openwrt/lede/r4se/Dockerfile.1-build-env
+++ b/openwrt/lede/base/Dockerfile.openwrt-lede-env
@@ -3,7 +3,7 @@ LABEL maintainer=admin@licsber.site
 
 RUN echo $(nproc) && \
     apt update > /dev/null && \
-    apt install -y -qq build-essential > /dev/null && \
+    apt install -y -qq build-essential git > /dev/null && \
     apt clean > /dev/null && \
     rm -rf /var/lib/apt/list/*
 
diff --git a/openwrt/lede/r4se/build-r4se.1-build-env.sh b/openwrt/lede/base/build.openwrt-lede-env.sh
similarity index 92%
rename from openwrt/lede/r4se/build-r4se.1-build-env.sh
rename to openwrt/lede/base/build.openwrt-lede-env.sh
index 3cbc55f..0bf73a1 100755
--- a/openwrt/lede/r4se/build-r4se.1-build-env.sh
+++ b/openwrt/lede/base/build.openwrt-lede-env.sh
@@ -4,7 +4,7 @@ DOCKERFILE=Dockerfile.r4se.1-build-env
 REGISTRY=registry.cn-beijing.aliyuncs.com
 NAMESPACE=licsber
 REPOSITORY=github
-TAG=r4se.1-build-env
+TAG=openwrt-lede-env
 
 IMAGE="$REGISTRY/$NAMESPACE/$REPOSITORY:$TAG"
 sudo docker build -t "$IMAGE" --file "$DOCKERFILE" .