Fix Ubuntu golang package hold only for 21.04

Signed-off-by: Chris Evich <[email protected]>
containers · Jun 29, 2022 · 98b5d75 · 98b5d75
1 parent 892f71b
commit 98b5d75
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cache_images/podman_tooling.sh b/cache_images/podman_tooling.sh
@@ -21,7 +21,7 @@ if [[ "$OS_RELEASE_ID" == "ubuntu" ]]; then
     bats_version="1.7.0"
     dl_url="https://github.com/bats-core/bats-core/archive/v${bats_version}.tar.gz"
     echo "Installing bats $bats_version"
-    curl --fail --location "$dl_url" | tar xzv -C /tmp
+    curl --fail --location "$dl_url" | tar xz -C /tmp
     pushd /tmp/bats-core-$bats_version
     $SUDO ./install.sh /usr/local  # prints install location
     popd

diff --git a/cache_images/ubuntu_packaging.sh b/cache_images/ubuntu_packaging.sh
@@ -143,7 +143,7 @@ INSTALL_PACKAGES=(\
 # Necessary to update cache of newly added repos
 lilto $SUDO apt-get -q -y update
 
-if (($OS_RELEASE_VER>=2104)); then
+if (($OS_RELEASE_VER==2104)); then
     echo "Blocking golang-* package interfearance with kubik containers-common"
     $SUDO apt-mark hold golang-github-containers-common golang-github-containers-image
 fi