From 9ab9d85fc584b4debe3267224c045e0398148886 Mon Sep 17 00:00:00 2001
From: Jhony Avella <jhony.avella@edunext.co>
Date: Mon, 31 Jul 2023 08:35:37 -0500
Subject: [PATCH] chore: remove xqueue permissions container

There is now a single "permissions" container that makes all permission changes in Tutor core
---
 ...731_080653_jhony.avella_remove_permissions_container.md | 1 +
 .../patches/local-docker-compose-permissions-command       | 1 +
 .../patches/local-docker-compose-permissions-volumes       | 1 +
 tutorxqueue/patches/local-docker-compose-services          | 7 -------
 4 files changed, 3 insertions(+), 7 deletions(-)
 create mode 100644 changelog.d/20230731_080653_jhony.avella_remove_permissions_container.md
 create mode 100644 tutorxqueue/patches/local-docker-compose-permissions-command
 create mode 100644 tutorxqueue/patches/local-docker-compose-permissions-volumes

diff --git a/changelog.d/20230731_080653_jhony.avella_remove_permissions_container.md b/changelog.d/20230731_080653_jhony.avella_remove_permissions_container.md
new file mode 100644
index 0000000..0908ab0
--- /dev/null
+++ b/changelog.d/20230731_080653_jhony.avella_remove_permissions_container.md
@@ -0,0 +1 @@
+- [Improvement] Removing the xqueue permissions container in favor of a global single permissions container. (by @jfavellar90)
diff --git a/tutorxqueue/patches/local-docker-compose-permissions-command b/tutorxqueue/patches/local-docker-compose-permissions-command
new file mode 100644
index 0000000..1d147a6
--- /dev/null
+++ b/tutorxqueue/patches/local-docker-compose-permissions-command
@@ -0,0 +1 @@
+setowner 1000 /mounts/xqueue
diff --git a/tutorxqueue/patches/local-docker-compose-permissions-volumes b/tutorxqueue/patches/local-docker-compose-permissions-volumes
new file mode 100644
index 0000000..0f5fc70
--- /dev/null
+++ b/tutorxqueue/patches/local-docker-compose-permissions-volumes
@@ -0,0 +1 @@
+- ../../data/xqueue/media:/mounts/xqueue
diff --git a/tutorxqueue/patches/local-docker-compose-services b/tutorxqueue/patches/local-docker-compose-services
index 3651e6b..49ec223 100644
--- a/tutorxqueue/patches/local-docker-compose-services
+++ b/tutorxqueue/patches/local-docker-compose-services
@@ -9,13 +9,6 @@ xqueue:
   restart: unless-stopped
   depends_on: {{ [("mysql", RUN_MYSQL)]|list_if }}
 
-xqueue-permissions:
-  image: {{ DOCKER_IMAGE_PERMISSIONS }}
-  command: ["1000", "/openedx/xqueue"]
-  restart: on-failure
-  volumes:
-    - ../../data/xqueue/media:/openedx/xqueue
-
 xqueue-consumer:
   image: {{ XQUEUE_DOCKER_IMAGE }}
   volumes: