chore: make docker-compose docker rootful compat (#437)

ansible · Oct 11, 2023 · c790779 · c790779
1 parent e0d1635
commit c790779
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/tools/docker/docker-compose-dev.yaml b/tools/docker/docker-compose-dev.yaml
@@ -16,15 +16,30 @@ x-environment:
   - EDA_SERVER=http://${EDA_HOST:-eda-api:8000}
 
 services:
+  podman-pre-setup:
+    user: "0"
+    image: quay.io/containers/podman:${EDA_PODMAN_VERSION:-v4}
+    privileged: true
+    command: >-
+      chown -R podman /home/podman/.local/share/containers/storage
+    ports:
+      - 8888:8888
+    volumes:
+      - 'podman_data:/home/podman/.local/share/containers/storage'
+
   podman:
     user: "1000"
     image: quay.io/containers/podman:${EDA_PODMAN_VERSION:-v4}
     privileged: true
-    command: podman system service --time=0 tcp://0.0.0.0:8888
+    command: >-
+      podman system service --time=0 tcp://0.0.0.0:8888
     ports:
       - 8888:8888
     volumes:
       - 'podman_data:/home/podman/.local/share/containers/storage'
+    depends_on:
+     - podman-pre-setup
+
 
   eda-ui:
     image: "${EDA_UI_IMAGE:-quay.io/ansible/eda-ui:main}"

diff --git a/tools/docker/docker-compose-stage.yaml b/tools/docker/docker-compose-stage.yaml
@@ -18,15 +18,29 @@ x-environment:
   - EDA_SERVER=http://eda-api:8000
 
 services:
+  podman-pre-setup:
+    user: "0"
+    image: quay.io/containers/podman:${EDA_PODMAN_VERSION:-v4}
+    privileged: true
+    command: >-
+      chown -R podman /home/podman/.local/share/containers/storage
+    ports:
+      - 8888:8888
+    volumes:
+      - 'podman_data:/home/podman/.local/share/containers/storage'
+
   podman:
     user: "1000"
     image: quay.io/containers/podman:${EDA_PODMAN_VERSION:-v4}
     privileged: true
-    command: podman system service --time=0 tcp://0.0.0.0:8888
+    command: >-
+      podman system service --time=0 tcp://0.0.0.0:8888
     ports:
       - 8888:8888
     volumes:
       - 'podman_data:/home/podman/.local/share/containers/storage'
+    depends_on:
+     - podman-pre-setup
 
   eda-ui:
     image: "${EDA_UI_IMAGE:-quay.io/ansible/eda-ui:main}"