summary and readme teak

MCDReforged · Dec 29, 2023 · 2cd4ca9 · 2cd4ca9
1 parent 8c3de2f
commit 2cd4ca9
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -45,9 +45,9 @@ jobs:
             let tagsMultiline = baseImageTags.join('\n')
             core.setOutput('base_target_tags', tagsMultiline)
             core.summary.
-              addRaw('**Input Tags**\n', true).addRaw('```', true).addRaw(inputTags, true).addRaw('```\n', true).
-              addRaw('**Base Image**\n', true).addRaw('```', true).addRaw(baseImage, true).addRaw('```\n', true).
-              addRaw('**Base Target Tags**\n', true).addRaw('```', true).addRaw(tagsMultiline, true).addRaw('```\n', true).
+              addRaw('### Input Tags\n', true).addRaw('```', true).addRaw(inputTags, true).addRaw('```\n', true).
+              addRaw('### Base Image\n', true).addRaw('```', true).addRaw(baseImage, true).addRaw('```\n', true).
+              addRaw('### Base Target Tags\n', true).addRaw('```', true).addRaw(tagsMultiline, true).addRaw('```\n', true).
               write()
 
         env:

diff --git a/README.md b/README.md
@@ -7,7 +7,13 @@ Official docker images for [MCDReforged](https://github.com/Fallen-Breath/MCDRef
 
 ## Images
 
-Base Images with MCDR only (built at https://github.com/Fallen-Breath/MCDReforged):
+### Base Image
+
+[![Docker](https://img.shields.io/docker/v/mcdreforged/mcdreforged/latest)](https://hub.docker.com/r/mcdreforged/mcdreforged)
+
+Built at https://github.com/Fallen-Breath/MCDReforged
+
+Default Python version: 3.11
 
 ```bash
 mcdreforged/mcdreforged:latest
@@ -18,7 +24,10 @@ mcdreforged/mcdreforged:2.13.0-py3.11
 mcdreforged/mcdreforged:2.13.0-py3.11-slim
 ```
 
-Images with extra packages
+### Image with extra packages
+
+Extra packages are collected from the [Plugin Catalogue](https://github.com/MCDReforged/PluginCatalogue),
+covering almost all required packages of the plugins in the catalogue
 
 ```bash
 mcdreforged/mcdreforged-extra:latest
@@ -29,7 +38,18 @@ mcdreforged/mcdreforged-extra:2.13.0-py3.11
 mcdreforged/mcdreforged-extra:2.13.0-py3.11-slim
 ```
 
-Images with openjdk (`-extra` means with extra packages)
+### Image with OpenJDK
+
+Supported openjdk distributions:
+
+- [corretoo](https://aws.amazon.com/corretto/)
+- [liberica](https://bell-sw.com/libericajdk/)
+- [temurin](https://adoptium.net/temurin/)
+- [zulu](https://www.azul.com/downloads/?package=jdk#zulu)
+
+Default JDK version: 17
+
+`-extra` suffix means with extra packages
 
 ```bash
 mcdreforged/mcdreforged-temurin:latest

diff --git a/src/Dockerfile-openjdk-corretto b/src/Dockerfile-openjdk-corretto
@@ -13,6 +13,9 @@ apt-get install -y gnupg ca-certificates curl
 curl -so- https://apt.corretto.aws/corretto.key | gpg --dearmor -o /usr/share/keyrings/corretto-keyring.gpg
 echo "deb [signed-by=/usr/share/keyrings/corretto-keyring.gpg] https://apt.corretto.aws stable main" | tee /etc/apt/sources.list.d/corretto.list
 apt-get update
+if [ "$JAVA" = "8" ]; then
+  JAVA="1.8.0"
+fi
 apt-get install -y "java-${JAVA}-amazon-corretto-jdk"
 java -version
 rm -rf /var/lib/apt/lists/*