From 99ff853de9ed4cfff8c5d6afa67469a49210ae14 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Thu, 13 Jan 2022 17:01:57 +0800
Subject: [PATCH] Refine package variables. v4.0.228

---
 .github/workflows/release.yml        | 8 ++++++--
 trunk/Dockerfile.pkg                 | 3 ---
 trunk/src/core/srs_core_version4.hpp | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2e86f11db..9e0185715 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -49,8 +49,10 @@ jobs:
       #   SRS_PACKAGE_ZIP=SRS-CentOS7-x86_64-4.0.145.zip
       #   SRS_PACKAGE_MD5=3880a26e30b283edf05700a4e69956e5
       - name: Create package zip
+        env:
+          PACKAGER: ${{ secrets.SRS_PACKAGER_BINARY }}
         run: |
-          docker build --tag srs:pkg --build-arg version=$SRS_VERSION -f trunk/Dockerfile.pkg . &&
+          docker build --tag srs:pkg --build-arg version=$SRS_VERSION --build-arg SRS_AUTO_PACKAGER=$PACKAGER -f trunk/Dockerfile.pkg . &&
           SRS_PACKAGE_ZIP=SRS-CentOS7-x86_64-$SRS_VERSION.zip &&
           docker run --rm -v $(pwd):/output srs:pkg cp objs/$SRS_PACKAGE_ZIP /output/ &&
           du -sh $SRS_PACKAGE_ZIP &&
@@ -72,9 +74,11 @@ jobs:
       # Build
       # Build SRS image
       - name: Build SRS docker image
+        env:
+          PACKAGER: ${{ secrets.SRS_PACKAGER_DOCKER }}
         run: |
           echo "Release ossrs/srs:$SRS_TAG"
-          docker build --tag ossrs/srs:$SRS_TAG -f trunk/Dockerfile .
+          docker build --tag ossrs/srs:$SRS_TAG --build-arg SRS_AUTO_PACKAGER=$PACKAGER -f trunk/Dockerfile .
 
       ################################################################
       # Docker
diff --git a/trunk/Dockerfile.pkg b/trunk/Dockerfile.pkg
index ade5778cd..ca6602ef3 100644
--- a/trunk/Dockerfile.pkg
+++ b/trunk/Dockerfile.pkg
@@ -6,9 +6,6 @@ ARG version
 # Install depends tools.
 RUN yum install -y zip
 
-# Setup the packager env.
-ENV SRS_AUTO_PACKAGER ossrs
-
 # Build and install SRS.
 ADD srs-server-${version}.tar.gz /srs
 WORKDIR /srs/srs-server-${version}/trunk
diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp
index d3c84788e..10978e4cc 100644
--- a/trunk/src/core/srs_core_version4.hpp
+++ b/trunk/src/core/srs_core_version4.hpp
@@ -9,6 +9,6 @@
 
 #define VERSION_MAJOR       4
 #define VERSION_MINOR       0
-#define VERSION_REVISION    227
+#define VERSION_REVISION    228
 
 #endif