From 6f188fa82e1aeea420b91989836310149c3229cf Mon Sep 17 00:00:00 2001
From: Matthias Dellweg <mdellweg@redhat.com>
Date: Tue, 29 Aug 2023 17:46:15 +0200
Subject: [PATCH] Fix workaround for podman bug

[noissue]
---
 .github/workflows/pulp_images.yml | 11 +++--------
 images/compose/assets/settings.py |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/pulp_images.yml b/.github/workflows/pulp_images.yml
index 462849fd..6a7b8476 100644
--- a/.github/workflows/pulp_images.yml
+++ b/.github/workflows/pulp_images.yml
@@ -199,18 +199,13 @@ jobs:
 
       - name: Install httpie and podman-compose
         run: |
-          echo ::group::HTTPIE
           sudo apt-get update -yq
           sudo -E apt-get -yq --no-install-suggests --no-install-recommends install httpie
-          echo ::endgroup::
           echo "HTTPIE_CONFIG_DIR=$GITHUB_WORKSPACE/.ci/assets/httpie/" >> $GITHUB_ENV
+          echo "Working around https://bugs.launchpad.net/ubuntu/+source/libpod/+bug/2024394"
+          curl -O http://archive.ubuntu.com/ubuntu/pool/universe/g/golang-github-containernetworking-plugins/containernetworking-plugins_1.1.1+ds1-1_amd64.deb
+          sudo dpkg -i containernetworking-plugins_1.1.1+ds1-1_amd64.deb
           pip install podman-compose
-          if [[ $(dpkg-query --showformat='${Version}' --show podman) == "3.4.4+ds1-1ubuntu1.22.04.1" && $(dpkg-query --showformat='${Version}' --show containernetworking-plugins) == "0.9.1+ds1-1" ]]
-          then
-            echo "Working around https://bugs.launchpad.net/ubuntu/+source/libpod/+bug/2024394"
-            curl -O http://archive.ubuntu.com/ubuntu/pool/universe/g/golang-github-containernetworking-plugins/containernetworking-plugins_1.1.1+ds1-1_amd64.deb
-            sudo dpkg -i containernetworking-plugins_1.1.1+ds1-1_amd64.deb
-          fi
         shell: bash
 
       - name: Build images
diff --git a/images/compose/assets/settings.py b/images/compose/assets/settings.py
index 54fcfbf0..6b7dd5cc 100644
--- a/images/compose/assets/settings.py
+++ b/images/compose/assets/settings.py
@@ -14,5 +14,5 @@
 TOKEN_SIGNATURE_ALGORITHM = "ES256"
 PUBLIC_KEY_PATH = "/etc/pulp/keys/container_auth_public_key.pem"
 PRIVATE_KEY_PATH = "/etc/pulp/keys/container_auth_private_key.pem"
-TELEMETRY = False
+ANALYTICS = False
 STATIC_ROOT = "/var/lib/operator/static/"