From feb2b45c0d01a2fee517ec460c3e44e610233138 Mon Sep 17 00:00:00 2001
From: "Jonathan R. Madsen" <jrmadsen@users.noreply.github.com>
Date: Thu, 19 May 2022 21:16:20 -0500
Subject: [PATCH] build-docker.sh: CI -> BUILD_CI (#63)

- docker run fix (remove -it argument)

[ROCm/rocprofiler-systems commit: 919dcf5456381476b6dc1c713acb7cea99043248]
---
 .../.github/workflows/cpack-opensuse.yml               | 10 ----------
 .../.github/workflows/cpack-ubuntu.yml                 | 10 ----------
 .../rocprofiler-systems/docker/build-docker-release.sh |  2 +-
 projects/rocprofiler-systems/docker/build-docker.sh    |  4 ++--
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/projects/rocprofiler-systems/.github/workflows/cpack-opensuse.yml b/projects/rocprofiler-systems/.github/workflows/cpack-opensuse.yml
index b3ab2c53ec..c4dd7e1179 100644
--- a/projects/rocprofiler-systems/.github/workflows/cpack-opensuse.yml
+++ b/projects/rocprofiler-systems/.github/workflows/cpack-opensuse.yml
@@ -20,16 +20,6 @@ jobs:
         extensions: ["--rocm +python", "--core +python"]
 
     steps:
-      - name: Patch Git
-        timeout-minutes: 5
-        run: |
-          apt-get update
-          apt-get install -y software-properties-common
-          add-apt-repository -y ppa:git-core/ppa
-          apt-get update
-          apt-get upgrade -y
-          apt-get install -y git
-
       - uses: actions/checkout@v3
         with:
           submodules: recursive
diff --git a/projects/rocprofiler-systems/.github/workflows/cpack-ubuntu.yml b/projects/rocprofiler-systems/.github/workflows/cpack-ubuntu.yml
index 6a3cd5ab35..35ceda01c5 100644
--- a/projects/rocprofiler-systems/.github/workflows/cpack-ubuntu.yml
+++ b/projects/rocprofiler-systems/.github/workflows/cpack-ubuntu.yml
@@ -20,16 +20,6 @@ jobs:
         extensions: ["--rocm +python", "--core +python"]
 
     steps:
-      - name: Patch Git
-        timeout-minutes: 5
-        run: |
-          apt-get update
-          apt-get install -y software-properties-common
-          add-apt-repository -y ppa:git-core/ppa
-          apt-get update
-          apt-get upgrade -y
-          apt-get install -y git
-
       - uses: actions/checkout@v3
         with:
           submodules: recursive
diff --git a/projects/rocprofiler-systems/docker/build-docker-release.sh b/projects/rocprofiler-systems/docker/build-docker-release.sh
index ab1f9931c4..28d3482521 100755
--- a/projects/rocprofiler-systems/docker/build-docker-release.sh
+++ b/projects/rocprofiler-systems/docker/build-docker-release.sh
@@ -33,7 +33,7 @@ build-release()
     shift
     shift
     shift
-    verbose-run docker run -it --rm -v ${PWD}:/home/omnitrace --env DISTRO=${OS} --env ROCM_VERSION=${ROCM_VERSION} --env VERSION=${CODE_VERSION} --env PYTHON_VERSIONS=\"${PYTHON_VERSIONS}\" ${CONTAINER} /home/omnitrace/scripts/build-release.sh ${@}
+    verbose-run docker run --rm -v ${PWD}:/home/omnitrace --env DISTRO=${OS} --env ROCM_VERSION=${ROCM_VERSION} --env VERSION=${CODE_VERSION} --env PYTHON_VERSIONS=\"${PYTHON_VERSIONS}\" ${CONTAINER} /home/omnitrace/scripts/build-release.sh ${@}
 }
 
 : ${DISTRO:=ubuntu}
diff --git a/projects/rocprofiler-systems/docker/build-docker.sh b/projects/rocprofiler-systems/docker/build-docker.sh
index 2060e57df4..131991f78a 100755
--- a/projects/rocprofiler-systems/docker/build-docker.sh
+++ b/projects/rocprofiler-systems/docker/build-docker.sh
@@ -4,7 +4,7 @@
 : ${DISTRO:=ubuntu}
 : ${VERSIONS:=20.04 18.04}
 : ${PYTHON_VERSIONS:="6 7 8 9 10"}
-: ${CI:=""}
+: ${BUILD_CI:=""}
 
 set -e
 
@@ -58,7 +58,7 @@ done
 
 DOCKER_FILE="Dockerfile.${DISTRO}"
 
-if [ -n "${CI}" ]; then DOCKER_FILE="${DOCKER_FILE}.ci"; fi
+if [ -n "${BUILD_CI}" ]; then DOCKER_FILE="${DOCKER_FILE}.ci"; fi
 if [ ! -f ${DOCKER_FILE} ]; then cd docker; fi
 if [ ! -f ${DOCKER_FILE} ]; then send-error "File \"${DOCKER_FILE}\" not found"; fi