Feat.

Feat.

Author: swoiow

.dockerignore

@@ -0,0 +1,5 @@
+*.pyc
+__pycache__
+.venv
+dev
+cache

Dockerfile

@@ -5,12 +5,18 @@ RUN chmod +x /usr/local/bin/dumb-init
 
 ARG DEVPI_VAR=5.4.0
 
+WORKDIR /app
+
 ARG MIRROR_URL=https://pypi.tuna.tsinghua.edu.cn/simple/
 ENV MIRROR_URL=${MIRROR_URL}
 ENV PIP_INDEX_URL=${MIRROR_URL}
-COPY patch.py /tmp/patch.py
-RUN pip install -q --no-cache-dir "devpi-server==${DEVPI_VAR}" && \
-    export patch_file=$(find /usr/local/lib -name "main.py"| grep devpi_server) && \
-    python /tmp/patch.py
+
+RUN pip install -q --no-cache-dir "devpi-server==${DEVPI_VAR}"
+
+COPY entrypoint.py entrypoint.py
+
+EXPOSE 3141
 
 ENTRYPOINT ["dumb-init", "--"]
+
+CMD ["python", "entrypoint.py"]

Makefile

@@ -0,0 +1,39 @@
+export MIRROR_URL := https://pypi.tuna.tsinghua.edu.cn/simple/
+
+build:
+	docker build -t pypi-mirror .
+
+
+up:
+	docker run -itd --rm \
+	--name pypi-mirror \
+	-p 0.0.0.0:8080:3141 \
+	-v $$(pwd)/cache:/cache \
+	-e MIRROR_URL=$(MIRROR_URL) \
+	-e CACHE_DIR=/cache \
+	pypi-mirror
+
+down:
+	docker stop pypi-mirror
+
+sh:
+	docker run -it --rm \
+	--name pypi-mirror \
+	--entrypoint /bin/sh \
+	pypi-mirror
+
+# testcases
+test-devpi:
+	docker run -it --rm \
+	--name test-pypi-mirror \
+	-e MIRROR_URL=$(MIRROR_URL) \
+	-e CACHE_DIR=/cache \
+	pypi-mirror
+
+test-userdefine-command:
+	docker run -it --rm \
+	--name test-pypi-mirror \
+	-e MIRROR_URL=$(MIRROR_URL) \
+	-e CACHE_DIR=/cache \
+	-e COMMAND="--include-mirrored-files --serverdir=/cache --proxy-timeout=10 --host=0.0.0.0" \
+	pypi-mirror

README.md

@@ -1,22 +1,41 @@
 # pypi-mirror
-本地 pypi 仓库镜像，可自定义上游镜像站 - local pypi mirror with diy mirror upstream.
+本地 pypi 仓库镜像，可自定义上游镜像站 - local pypi mirror with custom mirror upstream.
 
-*** 快速搭建 ***
+### 快速搭建
+
+`make build up`
+
+或者
 
 ```
-docker run -it --rm --name pypi \
-  -p 0.0.0.0:8080:80 \
-  -v $(pwd)/cache:/cache \
-  -e MIRROR_URL=https://pypi.tuna.tsinghua.edu.cn/simple/ \
-  pylab/pypi-cache \
-    devpi-server --include-mirrored-files \
-    --serverdir=/cache \
-    --proxy-timeout=10 \
-    --host=0.0.0.0 \
-    --port=80
+docker run -itd --rm \
+--name pypi-mirror \
+-p 0.0.0.0:8080:3141 \
+-v $PWD/cache:/cache \
+-e MIRROR_URL=https://pypi.tuna.tsinghua.edu.cn/simple/ \
+-e CACHE_DIR=/cache \
+pylab/pypi-mirror
 
 ```
 
+### 常见的 PyPI 镜像源
+
+  + ` https://pypi.tuna.tsinghua.edu.cn/simple/ `
+  + ` https://mirrors.aliyun.com/pypi/simple/ `
+  + ` https://pypi.doubanio.com/simple/ `
+
+### 测试
+
++ 测试 pip 安装
+
+    `pip install -i http://localhost:8080/root/pypi devpi-server`
+    
++ 测试 images
+
+    `make test-devpi`
+    
+    `make test-userdefine-command`
+
 ---
 
 ## devpi 指令

entrypoint.py

@@ -1,17 +1,45 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from os import environ
-import devpi_server
+from os import environ, path, listdir
 
-DEFAULT_MIRROR_URL = "https://pypi.org/simple/"
-PATCH_FILE = f"{environ['patch_file']}"
+from devpi_server import main as app
+from devpi_server.init import init as init_app
 
-fin = open(PATCH_FILE, "rt")
+split_print = lambda x: print("*" * 80 + "\n" + x + "\n" + "*" * 80)
+DEFAULT_MIRROR_URL = "https://pypi.tuna.tsinghua.edu.cn/simple/"
+MIRROR_URL = environ.get("MIRROR_URL", DEFAULT_MIRROR_URL)
+split_print(f"Current Pypi Mirror: {MIRROR_URL}")
+
+# Hard Patch
+COED_MIRROR_URL = "https://pypi.org/simple/"
+MAIN_FILE = app.__file__
+
+fin = open(MAIN_FILE, "rt")
 data = fin.read()
-data = data.replace(f"{DEFAULT_MIRROR_URL}", f"{environ['MIRROR_URL']}")
+data = data.replace(f"{COED_MIRROR_URL}", f"{MIRROR_URL}")
 fin.close()
 
-fin = open(PATCH_FILE, "wt")
+fin = open(MAIN_FILE, "wt")
 fin.write(data)
 fin.close()
+
+# Soft Patch
+app._pypi_ixconfig_default["mirror_url"] = f"{MIRROR_URL}"
+
+CACHE_DIR = environ.get("CACHE_DIR", "/cache")
+if not path.exists(CACHE_DIR) or not listdir(CACHE_DIR):
+    init_command = f"--init " \
+                   f"--serverdir={CACHE_DIR}"
+
+    split_print(f"[Run init] command: {init_command}")
+    init_app(argv=init_command.split(" "))
+
+runtime_command = f"--include-mirrored-files " \
+                  f"--serverdir={CACHE_DIR} " \
+                  f"--proxy-timeout=10 " \
+                  f"--host=0.0.0.0"
+
+runtime_command = environ.get("COMMAND", runtime_command)
+split_print(f"[Run devpi] command: {runtime_command}")
+app.main(runtime_command.split(" "))