From 489b08ec9db0564fcd2130a3d280ee58098b6cfa Mon Sep 17 00:00:00 2001 From: Wangchong Zhou Date: Tue, 5 Apr 2022 18:26:42 +0200 Subject: [PATCH 1/2] fix(env) localize environ pointer ffi.C.environ's address can change during realloc, this patch avoid globalize it to prevent pointing to wrong memory address --- kong/cmd/utils/env.lua | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kong/cmd/utils/env.lua b/kong/cmd/utils/env.lua index e8131da849ce..d1f3a0f472f9 100644 --- a/kong/cmd/utils/env.lua +++ b/kong/cmd/utils/env.lua @@ -12,14 +12,12 @@ ffi.cdef [[ ]] -local environ = ffi.C.environ - - local function read_all() log.debug("reading environment variables") local env = {} + local environ = ffi.C.environ if not environ then log.warn("could not access **environ") return env From ed0e081f422cee5f98f84bc5ffaa73641155843c Mon Sep 17 00:00:00 2001 From: Tyler Ball Date: Tue, 5 Apr 2022 19:38:46 -0700 Subject: [PATCH 2/2] chore(build) Don't build on Centos 8 or Rhel 8 The builds are failing with an empty log and we deprecated these anyways. Removing them to see if we can get everything else built. Signed-off-by: Tyler Ball --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 289f71afaf02..23ef10735ce1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -114,7 +114,7 @@ pipeline { sh 'make setup-kong-build-tools' sh 'cp $PRIVATE_KEY_FILE ../kong-build-tools/kong.private.gpg-key.asc' sh 'RESTY_IMAGE_TAG=7 make release' - sh 'RESTY_IMAGE_TAG=8 make release' + // sh 'RESTY_IMAGE_TAG=8 make release' } } stage('CentOS') { @@ -136,7 +136,7 @@ pipeline { sh 'make setup-kong-build-tools' sh 'cp $PRIVATE_KEY_FILE ../kong-build-tools/kong.private.gpg-key.asc' sh 'RESTY_IMAGE_TAG=7 make release' - sh 'RESTY_IMAGE_TAG=8 make release' + // sh 'RESTY_IMAGE_TAG=8 make release' } } stage('Debian OldStable') {