renames and reposition

MCDReforged · Dec 27, 2023 · 44fe4ec · 44fe4ec
1 parent 9476b45
commit 44fe4ec
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -6,33 +6,47 @@ Official docker images for [MCDReforged](https://github.com/Fallen-Breath/MCDRef
 
 Base Images with MCDR only:
 
-```
+```bash
 mcdreforged/mcdreforged:latest
+mcdreforged/mcdreforged:latest-slim
 mcdreforged/mcdreforged:2.13.0
-mcdreforged/mcdreforged:slim
 mcdreforged/mcdreforged:2.13.0-slim
+mcdreforged/mcdreforged:2.13.0-py3.11
+mcdreforged/mcdreforged:2.13.0-py3.11-slim
 ```
 
-Images with handy packages (`-hp` suffix)
+Images with extra packages
 
-```
-mcdreforged/mcdreforged:latest-hp
-mcdreforged/mcdreforged:2.13.0-hp
-mcdreforged/mcdreforged:slim-hp
-mcdreforged/mcdreforged:2.13.0-slim-hp
+```bash
+mcdreforged/mcdreforged-extra:latest
+mcdreforged/mcdreforged-extra:latest-slim
+mcdreforged/mcdreforged-extra:2.13.0
+mcdreforged/mcdreforged-extra:2.13.0-slim
+mcdreforged/mcdreforged-extra:2.13.0-py3.11
+mcdreforged/mcdreforged-extra:2.13.0-py3.11-slim
 ```
 
-Images with openjdk
+Images with openjdk (`-extra` means with extra packages)
 
-```
+```bash
 mcdreforged/mcdreforged-temurin:latest
-mcdreforged/mcdreforged-liberica:latest
-mcdreforged/mcdreforged-zulu:latest
-mcdreforged/mcdreforged-zulu:2.13.0
-mcdreforged/mcdreforged-zulu:slim
-mcdreforged/mcdreforged-zulu:2.13.0-slim
-mcdreforged/mcdreforged-zulu:latest-hp
-mcdreforged/mcdreforged-zulu:2.13.0-hp
-mcdreforged/mcdreforged-zulu:slim-hp
-mcdreforged/mcdreforged-zulu:2.13.0-slim-hp
+mcdreforged/mcdreforged-temurin:latest-jdk17
+mcdreforged/mcdreforged-temurin:latest-extra
+mcdreforged/mcdreforged-temurin:latest-jdk17-extra
+mcdreforged/mcdreforged-temurin:latest-slim
+mcdreforged/mcdreforged-temurin:latest-slim-jdk17
+mcdreforged/mcdreforged-temurin:latest-slim-extra
+mcdreforged/mcdreforged-temurin:latest-slim-jdk17-extra
+mcdreforged/mcdreforged-temurin:2.13.0
+mcdreforged/mcdreforged-temurin:2.13.0-jdk17
+mcdreforged/mcdreforged-temurin:2.13.0-slim
+mcdreforged/mcdreforged-temurin:2.13.0-slim-jdk17
+mcdreforged/mcdreforged-temurin:2.13.0-py3.11
+mcdreforged/mcdreforged-temurin:2.13.0-py3.11-jdk17
+mcdreforged/mcdreforged-temurin:2.13.0-py3.11-slim
+mcdreforged/mcdreforged-temurin:2.13.0-py3.11-slim-jdk17
+mcdreforged/mcdreforged-temurin:2.13.0-py3.11-extra
+mcdreforged/mcdreforged-temurin:2.13.0-py3.11-jdk17-extra
+mcdreforged/mcdreforged-temurin:2.13.0-py3.11-slim-extra
+mcdreforged/mcdreforged-temurin:2.13.0-py3.11-slim-jdk17-extra
 ```
diff --git a/handy/.gitignore → src/.gitignore b/handy/.gitignore → src/.gitignore
diff --git a/handy/Dockerfile → src/Dockerfile-extra b/handy/Dockerfile → src/Dockerfile-extra
diff --git a/openjdk/Dockerfile-liberica → src/Dockerfile-liberica b/openjdk/Dockerfile-liberica → src/Dockerfile-liberica
diff --git a/openjdk/Dockerfile-temurin → src/Dockerfile-temurin b/openjdk/Dockerfile-temurin → src/Dockerfile-temurin
diff --git a/openjdk/Dockerfile-zulu → src/Dockerfile-zulu b/openjdk/Dockerfile-zulu → src/Dockerfile-zulu
diff --git a/handy/requirements_collector.py → src/requirements_collector.py b/handy/requirements_collector.py → src/requirements_collector.py
diff --git a/handy/requirements_common.txt → src/requirements_common.txt b/handy/requirements_common.txt → src/requirements_common.txt
diff --git a/handy/requirements_extra.json → src/requirements_extra.json b/handy/requirements_extra.json → src/requirements_extra.json