You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by jh...@apache.org on 2022/05/11 23:15:37 UTC
[trafficcontrol] branch master updated: Only set BASE_IMAGE to rockylinux when RHEL_VERSION is 8 (#6825)
This is an automated email from the ASF dual-hosted git repository.
jhg03a pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new f371549512 Only set BASE_IMAGE to rockylinux when RHEL_VERSION is 8 (#6825)
f371549512 is described below
commit f37154951232af204aa90b09af659f458feb485f
Author: Zach Hoffman <zr...@apache.org>
AuthorDate: Wed May 11 17:15:32 2022 -0600
Only set BASE_IMAGE to rockylinux when RHEL_VERSION is 8 (#6825)
---
pkg | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/pkg b/pkg
index 5676c3a8f4..c6fcdb37b4 100755
--- a/pkg
+++ b/pkg
@@ -101,9 +101,11 @@ while getopts h78abdf:lopqvsSL opt; do
failure=1;
;;
7)
+ BASE_IMAGE=centos
RHEL_VERSION=7
;;
8)
+ BASE_IMAGE=rockylinux
RHEL_VERSION=8
;;
a)
@@ -195,6 +197,11 @@ fi
shift $((OPTIND-1))
+# Mark BASE_IMAGE for export
+export BASE_IMAGE;
+if [[ -n "$BASE_IMAGE" ]]; then
+ RUN_OPTIONS+=(-e BASE_IMAGE);
+fi
# Mark RHEL_VERSION for export
export RHEL_VERSION;
if [[ -n "$RHEL_VERSION" ]]; then