From ee2bc4fa543d01e39162cf5140c5ba9159b3c6c3 Mon Sep 17 00:00:00 2001
From: Alex <aizquier@redhat.com>
Date: Thu, 10 Oct 2024 21:44:06 +0200
Subject: [PATCH] ci: remove podman data persistence for docker-compose (#1096)

Signed-off-by: Alex <aizquier@redhat.com>
---
 .../docker/docker-compose-dev-redis-tls.yaml  | 15 ----------
 tools/docker/docker-compose-dev.yaml          | 30 -------------------
 tools/docker/docker-compose-stage.yaml        | 15 ----------
 3 files changed, 60 deletions(-)

diff --git a/tools/docker/docker-compose-dev-redis-tls.yaml b/tools/docker/docker-compose-dev-redis-tls.yaml
index e5958a5ad..d2ed18a32 100644
--- a/tools/docker/docker-compose-dev-redis-tls.yaml
+++ b/tools/docker/docker-compose-dev-redis-tls.yaml
@@ -51,27 +51,13 @@ x-environment:
 
 
 services:
-  podman-pre-setup:
-    user: "0"
-    image: ${EDA_PODMAN_IMAGE:-quay.io/containers/podman}:${EDA_PODMAN_VERSION:-v4}
-    privileged: true
-    command: >-
-      chown -R podman /home/podman/.local/share/containers/storage
-    volumes:
-      - 'podman_data:/home/podman/.local/share/containers/storage'
-
   podman:
-    user: "1000"
     image: ${EDA_PODMAN_IMAGE:-quay.io/containers/podman}:${EDA_PODMAN_VERSION:-v4}
     privileged: true
     command: >-
       podman system service --time=0 tcp://0.0.0.0:8888
     ports:
       - "${EDA_PODMAN_PORT:-8888}:8888"
-    volumes:
-      - 'podman_data:/home/podman/.local/share/containers/storage'
-    depends_on:
-     - podman-pre-setup
 
   certs:
     image: ${EDA_CERTBOT_IMAGE:-certbot/certbot}:${EDA_CERTBOT_VERSION:-latest}
@@ -262,4 +248,3 @@ services:
 
 volumes:
   postgres_data: {}
-  podman_data: {}
diff --git a/tools/docker/docker-compose-dev.yaml b/tools/docker/docker-compose-dev.yaml
index 184a5bd1b..30b2003fd 100644
--- a/tools/docker/docker-compose-dev.yaml
+++ b/tools/docker/docker-compose-dev.yaml
@@ -54,49 +54,21 @@ x-environment: &common-env
   SSL_CLIENT_CERTIFICATE: ${SSL_CLIENT_CERTIFICATE:-/certs/client.crt}
 
 services:
-  podman-pre-setup-node1:
-    user: "0"
-    image: ${EDA_PODMAN_IMAGE:-quay.io/containers/podman}:${EDA_PODMAN_VERSION:-v4}
-    privileged: true
-    command: >-
-      chown -R podman /home/podman/.local/share/containers/storage
-    volumes:
-      - 'podman_data_node1:/home/podman/.local/share/containers/storage'
-
-  podman-pre-setup-node2:
-    user: "0"
-    image: ${EDA_PODMAN_IMAGE:-quay.io/containers/podman}:${EDA_PODMAN_VERSION:-v4}
-    privileged: true
-    command: >-
-      chown -R podman /home/podman/.local/share/containers/storage
-    volumes:
-      - 'podman_data_node2:/home/podman/.local/share/containers/storage'
-
   podman-node1:
-    user: "1000"
     image: ${EDA_PODMAN_IMAGE:-quay.io/containers/podman}:${EDA_PODMAN_VERSION:-v4}
     privileged: true
     command: >-
       podman system service --time=0 tcp://0.0.0.0:8888
     ports:
       - "${EDA_PODMAN_NODE1_PORT:-8888}:8888"
-    volumes:
-      - 'podman_data_node1:/home/podman/.local/share/containers/storage'
-    depends_on:
-     - podman-pre-setup-node1
 
   podman-node2:
-    user: "1000"
     image: ${EDA_PODMAN_IMAGE:-quay.io/containers/podman}:${EDA_PODMAN_VERSION:-v4}
     privileged: true
     command: >-
       podman system service --time=0 tcp://0.0.0.0:8888
     ports:
       - "${EDA_PODMAN_NODE2_PORT:-8889}:8888"
-    volumes:
-      - 'podman_data_node2:/home/podman/.local/share/containers/storage'
-    depends_on:
-     - podman-pre-setup-node2
 
   postgres:
     image: ${EDA_POSTGRES_IMAGE:-quay.io/sclorg/postgresql-15-c9s}:${EDA_POSTGRES_VERSION:-latest}
@@ -303,8 +275,6 @@ services:
 
 volumes:
   postgres_data: {}
-  podman_data_node1: {}
-  podman_data_node2: {}
 
 networks:
   service-mesh:
diff --git a/tools/docker/docker-compose-stage.yaml b/tools/docker/docker-compose-stage.yaml
index 926d2d46d..f6a3a23a4 100644
--- a/tools/docker/docker-compose-stage.yaml
+++ b/tools/docker/docker-compose-stage.yaml
@@ -46,27 +46,13 @@ x-environment:
   - SSL_CLIENT_CERTIFICATE=${SSL_CLIENT_CERTIFICATE:-/certs/client.crt}
 
 services:
-  podman-pre-setup:
-    user: "0"
-    image: ${EDA_PODMAN_IMAGE:-quay.io/containers/podman}:${EDA_PODMAN_VERSION:-v4}
-    privileged: true
-    command: >-
-      chown -R podman /home/podman/.local/share/containers/storage
-    volumes:
-      - 'podman_data:/home/podman/.local/share/containers/storage'
-
   podman:
-    user: "1000"
     image: ${EDA_PODMAN_IMAGE:-quay.io/containers/podman}:${EDA_PODMAN_VERSION:-v4}
     privileged: true
     command: >-
       podman system service --time=0 tcp://0.0.0.0:8888
     ports:
       - '${EDA_PODMAN_PORT:-8888}:8888'
-    volumes:
-      - 'podman_data:/home/podman/.local/share/containers/storage'
-    depends_on:
-     - podman-pre-setup
 
   postgres:
     image: ${EDA_POSTGRES_IMAGE:-quay.io/sclorg/postgresql-15-c9s}:${EDA_POSTGRES_VERSION:-latest}
@@ -237,7 +223,6 @@ services:
 
 volumes:
   postgres_data: {}
-  podman_data: {}
   eda-api-staticfiles: {}
 
 networks: