fix(fips): set KONG_PACKAGE_NAME envrionment variable and double chec…

…k when packaing
Kong · Aug 31, 2022 · 74e592b · 74e592b
1 parent 74b423a
commit 74e592b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -110,6 +110,7 @@ pipeline {
                         PATH = "/home/ubuntu/bin/:${env.PATH}"
                         GITHUB_SSH_KEY = credentials('github_bot_ssh_key')
                         DOCKER_REPOSITORY = "kong/kong-build-tools-private"
+                        KONG_PACKAGE_NAME = "kong-enterprise-edition-fips"
                     }
                     steps {
                         sh 'echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin || true'

diff --git a/fpm-entrypoint.sh b/fpm-entrypoint.sh
@@ -40,8 +40,9 @@ then
   PACKAGE_REPLACES=kong-community-edition
   PACKAGE_REPLACES_2=kong-enterprise-edition-fips
 
-elif [ "$KONG_PACKAGE_NAME" = "kong-enterprise-edition-fips" ]
+elif [ "$KONG_PACKAGE_NAME" = "kong-enterprise-edition-fips" ] || [ "$SSL_PROVIDER" = "boringssl" ]
 then
+  KONG_PACKAGE_NAME=kong-enterprise-edition-fips
   PACKAGE_CONFLICTS=kong-community-edition
   PACKAGE_CONFLICTS_2=kong-enterprise-edition