From 64b0e09e87dca32adedba8ee6ba812c1d2b6653d Mon Sep 17 00:00:00 2001
From: jainnikhil30 <jainnikhil30@gmail.com>
Date: Thu, 16 Mar 2023 18:04:20 +0530
Subject: [PATCH] dont user githubusercontent for containers.conf and
 podman-containers.conf

---
 .../ansible/roles/dockerfile/templates/Dockerfile.j2 |  4 ++--
 tools/docker-compose/containers.conf                 | 12 ++++++++++++
 tools/docker-compose/podman-containers.conf          |  5 +++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 tools/docker-compose/containers.conf
 create mode 100644 tools/docker-compose/podman-containers.conf

diff --git a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
index e35234f62267..24771536785d 100644
--- a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
+++ b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2
@@ -208,8 +208,8 @@ ADD tools/docker-compose/start_tests.sh /start_tests.sh
 ADD tools/docker-compose/bootstrap_development.sh /usr/bin/bootstrap_development.sh
 ADD tools/docker-compose/entrypoint.sh /entrypoint.sh
 ADD tools/scripts/config-watcher /usr/bin/config-watcher
-ADD https://raw.githubusercontent.com/containers/libpod/master/contrib/podmanimage/stable/containers.conf /etc/containers/containers.conf
-ADD https://raw.githubusercontent.com/containers/libpod/master/contrib/podmanimage/stable/podman-containers.conf /var/lib/awx/.config/containers/containers.conf
+ADD tools/docker-compose/containers.conf /etc/containers/containers.conf
+ADD tools/docker-compose/podman-containers.conf /var/lib/awx/.config/containers/containers.conf
 {% else %}
 ADD tools/ansible/roles/dockerfile/files/launch_awx.sh /usr/bin/launch_awx.sh
 ADD tools/ansible/roles/dockerfile/files/launch_awx_task.sh /usr/bin/launch_awx_task.sh
diff --git a/tools/docker-compose/containers.conf b/tools/docker-compose/containers.conf
new file mode 100644
index 000000000000..220c1f850c67
--- /dev/null
+++ b/tools/docker-compose/containers.conf
@@ -0,0 +1,12 @@
+[containers]
+netns="host"
+userns="host"
+ipcns="host"
+utsns="host"
+cgroupns="host"
+cgroups="disabled"
+log_driver = "k8s-file"
+[engine]
+cgroup_manager = "cgroupfs"
+events_logger="file"
+runtime="crun"
diff --git a/tools/docker-compose/podman-containers.conf b/tools/docker-compose/podman-containers.conf
new file mode 100644
index 000000000000..2bdd95a3b5eb
--- /dev/null
+++ b/tools/docker-compose/podman-containers.conf
@@ -0,0 +1,5 @@
+[containers]
+volumes = [
+	"/proc:/proc",
+]
+default_sysctls = []