wrong workflow

somehow22 · Nov 2, 2024 · e251d21 · e251d21
1 parent 2e02fe9
commit e251d21
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/.github/workflows/singbox-build-push.yml b/.github/workflows/singbox-build-push.yml
@@ -49,7 +49,7 @@ jobs:
     - name: Get Alpine linux-lts-dev version
       id: linux_version
       run: |
-        KERNEL_VERSION=$(docker run --rm alpine:latest sh -c "apk update && apk add --no-cache linux-lts-dev && apk info -v linux-lts-dev | grep -oP '(?<=linux-lts-dev-)[\d\.]+'")
+        KERNEL_VERSION=$(docker run --rm alpine:latest sh -c "apk update && apk add --no-cache linux-lts-dev && apk info -v linux-lts-dev | sed 's/linux-lts-dev-\([0-9\.]\+\)/\1/'")
         echo "KERNEL_VERSION=${KERNEL_VERSION}" >> $GITHUB_ENV
 
     - name: Build and push

diff --git a/singbox/Dockerfile b/singbox/Dockerfile
@@ -41,11 +41,6 @@ RUN cd /usr/src/tcp-brutal && \
     akms install all && \
     echo "Built tcp-brutal module for Sing-box version ${SINGBOX_VERSION}"
 
-# Extract the installed Linux LTS kernel version
-RUN KERNEL_VERSION=$(apk info -v linux-lts-dev | grep -oP '(?<=linux-lts-dev-)[\d\.]+') && \
-    TAG="singbox-${SINGBOX_VERSION}-kernel-${KERNEL_VERSION}" && \
-    echo "Tagging the package as $TAG"
-
 # Clean up unnecessary files to reduce image size
 RUN apk del alpine-sdk linux-lts-dev && \
     rm -rf /usr/src/tcp-brutal