Merge pull request #1 from tete1030/master

123

Author: caiyy

.github/workflows/build-openwrt.yml

@@ -48,6 +48,7 @@ env:
   DK_CONTEXT: .
   DK_NO_REMOTE_CACHE: 1
   DK_NO_BUILDTIME_PUSH: 1
+  DK_CONVERT_MULTISTAGE_TO_IMAGE: 1
   DOCKERFILE_BASE: Dockerfile
   DOCKERFILE_INC: Dockerfile-inc
   DOCKERFILE_PACKAGE: Dockerfile-package
@@ -167,7 +168,7 @@ jobs:
         [ "x${{ (github.event_name == 'push' && contains(github.event.head_commit.message, '#push_when_fail#')) || github.event.client_payload.push_when_fail || github.event.deployment.payload.push_when_fail }}" != "xtrue" ] || OPT_PUSH_WHEN_FAIL=1
         echo "::set-env name=OPT_PUSH_WHEN_FAIL::${OPT_PUSH_WHEN_FAIL}"
 
-        scripts/cleanup.sh
+        [ "x${TEST}" = "x1" ] || scripts/cleanup.sh
 
     - name: Set up Docker Buildx
       id: buildx
@@ -230,10 +231,11 @@ jobs:
         build_image clone
 
     # Allow intermediate customization
-    - name: Debug set, wait for SSH connection
+    - name: Debug set, wait for SSH connection (timeout 5min)
       if: env.OPT_DEBUG == '1'
       env:
         TIMEOUT_MIN: 5
+        TMATE_DOCKER_IMAGE: ${{env.DK_LAST_BUILD_TARGET}}
       uses: tete1030/debugger-action@my
 
     - name: Apply customizations
@@ -314,10 +316,12 @@ jobs:
         path: ${{ env.FIRMWARE }}
 
     # failure checking
-    - name: Failed/debug set, wait for SSH connection ( you are safe to cancel the job now )
+    - name: Failed/debug set, wait for SSH connection (timeout 30min. You are safe to cancel the job now.)
       if: |
         failure()
         || env.OPT_DEBUG == '1'
+      env:
+        TMATE_DOCKER_IMAGE: ${{env.DK_LAST_BUILD_TARGET}}
       uses: tete1030/debugger-action@my
 
   build-package:
@@ -408,7 +412,7 @@ jobs:
         [ "x${{ (github.event_name == 'push' && contains(github.event.head_commit.message, '#push_when_fail#')) || github.event.client_payload.push_when_fail || github.event.deployment.payload.push_when_fail }}" != "xtrue" ] || OPT_PUSH_WHEN_FAIL=1
         echo "::set-env name=OPT_PUSH_WHEN_FAIL::${OPT_PUSH_WHEN_FAIL}"
 
-        scripts/cleanup.sh
+        [ "x${TEST}" = "x1" ] || scripts/cleanup.sh
 
     - name: Set up Docker Buildx
       id: buildx
@@ -460,10 +464,11 @@ jobs:
         pull_image
 
     # Allow intermediate customization
-    - name: Debug set, wait for SSH connection
+    - name: Debug set, wait for SSH connection (timeout 5min)
       if: env.OPT_DEBUG == '1'
       env:
         TIMEOUT_MIN: 5
+        TMATE_DOCKER_IMAGE: ${{env.DK_LAST_BUILD_TARGET}}
       uses: tete1030/debugger-action@my
 
     - name: Update repo and packages
@@ -542,8 +547,10 @@ jobs:
         path: openwrt/bin
 
     # failure checking
-    - name: Failed/debug set, wait for SSH connection ( you are safe to cancel the job now )
+    - name: Failed/debug set, wait for SSH connection (timeout 30min. You are safe to cancel the job now.)
       if: failure() || env.OPT_DEBUG == '1'
+      env:
+        TMATE_DOCKER_IMAGE: ${{env.DK_LAST_BUILD_TARGET}}
       uses: tete1030/debugger-action@my
 
   build-direct:
@@ -588,7 +595,7 @@ jobs:
       run: scripts/customize.sh
 
     # Allow intermediate customization
-    - name: Debug set, wait for SSH connection
+    - name: Debug set, wait for SSH connection (timeout 5min)
       if: env.OPT_DEBUG == '1'
       env:
         TIMEOUT_MIN: 5
@@ -649,6 +656,6 @@ jobs:
         path: ${{ env.FIRMWARE }}
 
     # failure checking
-    - name: Failed/debug set, wait for SSH connection ( you are safe to cancel the job now )
+    - name: Failed/debug set, wait for SSH connection (timeout 30min. You are safe to cancel the job now.)
       if: failure() || env.OPT_DEBUG == '1'
       uses: tete1030/debugger-action@my

Dockerfiles/Dockerfile

@@ -10,7 +10,7 @@
 # in the 'tests' dir is also changed in the same way.
 # 不推荐修改，已处在最优状态。如果仍要修改，确保tests文件夹中的对应文件以类似方式修改。
 
-FROM ubuntu:18.04 AS init-env
+FROM ubuntu:18.04 AS init-env-stage
 RUN useradd -ms /bin/bash builder \
   && apt-get -qq update && apt-get -qq install sudo \
   && /bin/bash -c 'echo "builder ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/99_sudo_include_file'
@@ -21,26 +21,26 @@ RUN mkdir scripts
 COPY --chown=builder:builder scripts/initenv.sh ./scripts/initenv.sh
 RUN scripts/initenv.sh
 
-FROM init-env AS clone
+FROM init-env-stage AS clone-stage
 ARG REPO_URL
 ARG REPO_BRANCH
 COPY --chown=builder:builder scripts/update_repo.sh ./scripts/update_repo.sh
 RUN REPO_URL="${REPO_URL}" REPO_BRANCH="${REPO_BRANCH}" scripts/update_repo.sh
 COPY --chown=builder:builder scripts/update_feeds.sh ./scripts/update_feeds.sh
 RUN OPT_UPDATE_FEEDS=1 scripts/update_feeds.sh
 
-FROM clone AS custom
+FROM clone-stage AS custom-stage
 ARG CONFIG_FILE
 COPY --chown=builder:builder scripts/customize.sh ./scripts/customize.sh
 COPY --chown=builder:builder patches ./patches
 COPY --chown=builder:builder ${CONFIG_FILE} ./
 RUN CONFIG_FILE="${CONFIG_FILE}" scripts/customize.sh
 
-FROM custom AS download
+FROM custom-stage AS download-stage
 COPY --chown=builder:builder scripts/download.sh ./scripts/download.sh
 RUN scripts/download.sh
 
-FROM download AS compile
+FROM download-stage AS compile-stage
 COPY --chown=builder:builder scripts/compile.sh ./scripts/compile.sh
 RUN COMPILE_OPTIONS="prepare" scripts/compile.sh m \
   || COMPILE_OPTIONS="prepare" scripts/compile.sh s

Dockerfiles/Dockerfile-inc

@@ -11,24 +11,24 @@
 # 不推荐修改，已处在最优状态。如果仍要修改，确保tests文件夹中的对应文件以类似方式修改。
 
 ARG DK_IMAGE_BASE
-FROM ${DK_IMAGE_BASE} AS clone
+FROM ${DK_IMAGE_BASE} AS clone-stage
 ARG OPT_UPDATE_REPO
 ARG OPT_UPDATE_FEEDS
 # No cache to use for incremental building, so we just copy all files altogether
 COPY --chown=builder:builder scripts ./scripts
 RUN [ "x${OPT_UPDATE_REPO}" != "x1" ] || scripts/update_repo.sh
 RUN OPT_UPDATE_FEEDS="${OPT_UPDATE_FEEDS}" scripts/update_feeds.sh
 
-FROM clone AS custom
+FROM clone-stage AS custom-stage
 COPY --chown=builder:builder patches ./patches
 ARG CONFIG_FILE
 COPY --chown=builder:builder ${CONFIG_FILE} ./
 RUN CONFIG_FILE="${CONFIG_FILE}" NONSTRICT_PATCH=1 scripts/customize.sh
 
-FROM custom AS download
+FROM custom-stage AS download-stage
 RUN scripts/download.sh
 
-FROM download AS compile
+FROM download-stage AS compile-stage
 COPY --chown=builder:builder scripts/compile.sh ./scripts/compile.sh
 RUN COMPILE_OPTIONS="prepare" scripts/compile.sh m \
   || COMPILE_OPTIONS="prepare" scripts/compile.sh s

Dockerfiles/Dockerfile-package

@@ -11,22 +11,22 @@
 # 不推荐修改，已处在最优状态。如果仍要修改，确保tests文件夹中的对应文件以类似方式修改。
 
 ARG DK_IMAGE_BASE
-FROM ${DK_IMAGE_BASE} AS clone
+FROM ${DK_IMAGE_BASE} AS clone-stage
 ARG OPT_UPDATE_FEEDS
 # No cache to use for incremental building, so we just copy all files altogether
 COPY --chown=builder:builder scripts ./scripts
 RUN OPT_UPDATE_FEEDS="${OPT_UPDATE_FEEDS}" scripts/update_feeds.sh
 
-FROM clone AS custom
+FROM clone-stage AS custom-stage
 COPY --chown=builder:builder patches ./patches
 ARG CONFIG_FILE
 COPY --chown=builder:builder ${CONFIG_FILE} ./
 RUN CONFIG_FILE="${CONFIG_FILE}" NONSTRICT_PATCH=1 scripts/customize.sh
 
-FROM custom AS download
+FROM custom-stage AS download-stage
 RUN scripts/download.sh
 
-FROM download AS compile
+FROM download-stage AS compile-stage
 RUN (COMPILE_OPTIONS="package/compile" scripts/compile.sh m \
     || COMPILE_OPTIONS="package/compile" scripts/compile.sh s) \
   && (COMPILE_OPTIONS="package/index" scripts/compile.sh m \

Dockerfiles/tests/Dockerfile

@@ -5,7 +5,7 @@
 # Author: Texot
 #=================================================
 
-FROM ubuntu:18.04 AS init-env
+FROM ubuntu:18.04 AS init-env-stage
 RUN useradd -ms /bin/bash builder \
   && apt-get -qq update && apt-get -qq install sudo \
   && /bin/bash -c 'echo "builder ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/99_sudo_include_file'
@@ -15,7 +15,7 @@ RUN mkdir scripts
 COPY --chown=builder:builder scripts/initenv.sh ./scripts/initenv.sh
 # RUN scripts/initenv.sh
 
-FROM init-env AS clone
+FROM init-env-stage AS clone-stage
 ARG REPO_URL
 ARG REPO_BRANCH
 COPY --chown=builder:builder scripts/update_repo.sh ./scripts/update_repo.sh
@@ -24,18 +24,18 @@ COPY --chown=builder:builder scripts/update_feeds.sh ./scripts/update_feeds.sh
 # RUN OPT_UPDATE_FEEDS=1 scripts/update_feeds.sh
 RUN mkdir openwrt
 
-FROM clone AS custom
+FROM clone-stage AS custom-stage
 ARG CONFIG_FILE
 COPY --chown=builder:builder scripts/customize.sh ./scripts/customize.sh
 COPY --chown=builder:builder patches ./patches
 COPY --chown=builder:builder ${CONFIG_FILE} ./
 # RUN CONFIG_FILE="${CONFIG_FILE}" scripts/customize.sh
 
-FROM custom AS download
+FROM custom-stage AS download-stage
 COPY --chown=builder:builder scripts/download.sh ./scripts/download.sh
 # RUN scripts/download.sh
 
-FROM download AS compile
+FROM download-stage AS compile-stage
 COPY --chown=builder:builder scripts/compile.sh ./scripts/compile.sh
 # RUN COMPILE_OPTIONS="prepare" scripts/compile.sh m \
 #   || COMPILE_OPTIONS="prepare" scripts/compile.sh s

Dockerfiles/tests/Dockerfile-inc

@@ -6,23 +6,23 @@
 #=================================================
 
 ARG DK_IMAGE_BASE
-FROM ${DK_IMAGE_BASE} AS clone
+FROM ${DK_IMAGE_BASE} AS clone-stage
 ARG OPT_UPDATE_REPO
 ARG OPT_UPDATE_FEEDS
 COPY --chown=builder:builder scripts ./scripts
 # RUN [ "x${OPT_UPDATE_REPO}" != "x1" ] || scripts/update_repo.sh
 # RUN OPT_UPDATE_FEEDS="${OPT_UPDATE_FEEDS}" scripts/update_feeds.sh
 
-FROM clone AS custom
+FROM clone-stage AS custom-stage
 COPY --chown=builder:builder patches ./patches
 ARG CONFIG_FILE
 COPY --chown=builder:builder ${CONFIG_FILE} ./
 # RUN CONFIG_FILE="${CONFIG_FILE}" NONSTRICT_PATCH=1 scripts/customize.sh
 
-FROM custom AS download
+FROM custom-stage AS download-stage
 # RUN scripts/download.sh
 
-FROM download AS compile
+FROM download-stage AS compile-stage
 COPY --chown=builder:builder scripts/compile.sh ./scripts/compile.sh
 # RUN COMPILE_OPTIONS="prepare" scripts/compile.sh m \
 #   || COMPILE_OPTIONS="prepare" scripts/compile.sh s

Dockerfiles/tests/Dockerfile-package

@@ -6,21 +6,21 @@
 #=================================================
 
 ARG DK_IMAGE_BASE
-FROM ${DK_IMAGE_BASE} AS clone
+FROM ${DK_IMAGE_BASE} AS clone-stage
 ARG OPT_UPDATE_FEEDS
 COPY --chown=builder:builder scripts ./scripts
 # RUN OPT_UPDATE_FEEDS="${OPT_UPDATE_FEEDS}" scripts/update_feeds.sh
 
-FROM clone AS custom
+FROM clone-stage AS custom-stage
 COPY --chown=builder:builder patches ./patches
 ARG CONFIG_FILE
 COPY --chown=builder:builder ${CONFIG_FILE} ./
 # RUN CONFIG_FILE="${CONFIG_FILE}" NONSTRICT_PATCH=1 scripts/customize.sh
 
-FROM custom AS download
+FROM custom-stage AS download-stage
 # RUN scripts/download.sh
 
-FROM download AS compile
+FROM download-stage AS compile-stage
 # RUN (COMPILE_OPTIONS="package/compile" scripts/compile.sh m \
 #     || COMPILE_OPTIONS="package/compile" scripts/compile.sh s) \
 #   && (COMPILE_OPTIONS="package/index" scripts/compile.sh m \