From 763eab824f56101c9d6a1b3d4545187f20bca2c5 Mon Sep 17 00:00:00 2001
From: Vishesh 'ironeagle' Bangotra <aetoskia@gmail.com>
Date: Sat, 1 Nov 2025 16:38:36 +0530
Subject: [PATCH 1/5] devpi for pip packages

---
 docker-compose.yaml | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 38665ab..05447f6 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -28,6 +28,13 @@ x-volume-configs:
   registry_ui: &registry_ui_volumes
     - /mnt/omnissiah-vault/configs/auth:/auth:ro
 
+  devpi: &devpi_volumes
+    - type: bind
+      source: /mnt/omnissiah-vault/configs/devpi
+      target: /data
+      bind:
+        create_host_path: true
+
 services:
   registry-ui:
     image: joxit/docker-registry-ui:latest
@@ -122,3 +129,16 @@ services:
     restart: always
     profiles:
       - server-pi
+
+  devpi:
+    image: ghcr.io/devpi/devpi:latest
+    container_name: devpi
+    restart: unless-stopped
+    ports:
+      - "6006:3141"
+    volumes: *devpi_volumes
+    environment:
+      - DEVPI_SERVERDIR=/data
+      - DEVPI_PASSWORD=admin
+    profiles:
+      - server-pi
\ No newline at end of file
-- 
2.49.1


From f032ccef3961db91486d250cac8d500114d0a6f7 Mon Sep 17 00:00:00 2001
From: Vishesh 'ironeagle' Bangotra <aetoskia@gmail.com>
Date: Sat, 1 Nov 2025 16:58:19 +0530
Subject: [PATCH 2/5] using pypiserver instead of devpi

---
 docker-compose.yaml | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 05447f6..f398d79 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -28,9 +28,9 @@ x-volume-configs:
   registry_ui: &registry_ui_volumes
     - /mnt/omnissiah-vault/configs/auth:/auth:ro
 
-  devpi: &devpi_volumes
+  pypiserver: &pypiserver_volumes
     - type: bind
-      source: /mnt/omnissiah-vault/configs/devpi
+      source: /mnt/omnissiah-vault/data/pypiserver
       target: /data
       bind:
         create_host_path: true
@@ -130,15 +130,13 @@ services:
     profiles:
       - server-pi
 
-  devpi:
-    image: ghcr.io/devpi/devpi:latest
-    container_name: devpi
+  pypiserver:
+    image: pypiserver/pypiserver:latest
+    container_name: pypiserver
     restart: unless-stopped
     ports:
-      - "6006:3141"
-    volumes: *devpi_volumes
-    environment:
-      - DEVPI_SERVERDIR=/data
-      - DEVPI_PASSWORD=admin
+      - "6006:8080"
+    volumes: *pypiserver_volumes
+    command: -P . -a . /data
     profiles:
       - server-pi
\ No newline at end of file
-- 
2.49.1


From 3b7bbddac96a1d2eab4e3acb4fda7d98d005d655 Mon Sep 17 00:00:00 2001
From: Vishesh 'ironeagle' Bangotra <aetoskia@gmail.com>
Date: Sat, 1 Nov 2025 17:20:46 +0530
Subject: [PATCH 3/5] fixes for more features like update, download list

---
 docker-compose.yaml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index f398d79..d0dbcfa 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -29,6 +29,8 @@ x-volume-configs:
     - /mnt/omnissiah-vault/configs/auth:/auth:ro
 
   pypiserver: &pypiserver_volumes
+    - /mnt/omnissiah-vault/configs/auth:/auth:ro
+
     - type: bind
       source: /mnt/omnissiah-vault/data/pypiserver
       target: /data
@@ -137,6 +139,13 @@ services:
     ports:
       - "6006:8080"
     volumes: *pypiserver_volumes
-    command: -P . -a . /data
+    environment:
+      - PYPISERVER_AUTH=update,download,list
+    command:
+      - -P
+      - /auth/.htpasswd
+      - -a
+      - update,download,list
+      - /data
     profiles:
-      - server-pi
\ No newline at end of file
+      - server-pi
-- 
2.49.1


From 8609ff6a0cc1fd3091268db74986f7529c924d4c Mon Sep 17 00:00:00 2001
From: Vishesh 'ironeagle' Bangotra <aetoskia@gmail.com>
Date: Sat, 1 Nov 2025 17:25:08 +0530
Subject: [PATCH 4/5] correct htpasswd

---
 docker-compose.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index d0dbcfa..7eabcd6 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -143,7 +143,7 @@ services:
       - PYPISERVER_AUTH=update,download,list
     command:
       - -P
-      - /auth/.htpasswd
+      - /auth/htpasswd
       - -a
       - update,download,list
       - /data
-- 
2.49.1


From 6050307d8750495d4786a8e583fb06071c529c57 Mon Sep 17 00:00:00 2001
From: Vishesh 'ironeagle' Bangotra <aetoskia@gmail.com>
Date: Sat, 1 Nov 2025 18:05:48 +0530
Subject: [PATCH 5/5] fixes

---
 docker-compose.yaml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 7eabcd6..718c16f 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -28,11 +28,11 @@ x-volume-configs:
   registry_ui: &registry_ui_volumes
     - /mnt/omnissiah-vault/configs/auth:/auth:ro
 
-  pypiserver: &pypiserver_volumes
+  pypi: &pypi_volumes
     - /mnt/omnissiah-vault/configs/auth:/auth:ro
 
     - type: bind
-      source: /mnt/omnissiah-vault/data/pypiserver
+      source: /mnt/omnissiah-vault/data/pypi
       target: /data
       bind:
         create_host_path: true
@@ -132,13 +132,13 @@ services:
     profiles:
       - server-pi
 
-  pypiserver:
+  pypi-server:
     image: pypiserver/pypiserver:latest
-    container_name: pypiserver
+    container_name: pypi-server
     restart: unless-stopped
     ports:
       - "6006:8080"
-    volumes: *pypiserver_volumes
+    volumes: *pypi_volumes
     environment:
       - PYPISERVER_AUTH=update,download,list
     command:
@@ -146,6 +146,6 @@ services:
       - /auth/htpasswd
       - -a
       - update,download,list
-      - /data
+      - /data/packages
     profiles:
       - server-pi
-- 
2.49.1