Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Paper/Minecraft 1.18 update #269

Merged
merged 5 commits into from
Dec 2, 2021
Merged

Paper/Minecraft 1.18 update #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ed03fdd
chore(deps): update [email protected]:papermc/paper.git commit hash to 0…
renovate-bot Dec 1, 2021
0b81b2c
fix: update ./gradlew subcommand for build paperclip.jar
sksat Dec 1, 2021
9d5c8af
fix: output jar filename
sksat Dec 1, 2021
dbc527f
update: Paper/Minecraft version to 1.18
sksat Dec 1, 2021
941fa70
update: Paper/Minecraft version in README
sksat Dec 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
IMG_TAG=main
MINECRAFT_VERSION='1.17.1'
PAPER_VERSION='1.17.1-R0.1-SNAPSHOT'
MINECRAFT_VERSION='1.18'
PAPER_VERSION='1.18-R0.1-SNAPSHOT'
# [email protected]:PaperMC/Paper.git
PAPER_COMMIT=22aaf913686c8518e375deb01c6cde74942d3ac2
PAPER_COMMIT=0cd411efdfab0b29d4d0410f3b02f750fe88e4ed
20 changes: 10 additions & 10 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ Docker container for [PaperMC](https://papermc.io/)

|tag|Image Size|
|-|-|
|`1.17.1`|![1.17.1](https://img.shields.io/docker/image-size/sksat/papermc-docker/1.17.1)|
|`1.17.1-R0.1-SNAPSHOT`|![1.17.1-R0.1-SNAPSHOT](https://img.shields.io/docker/image-size/sksat/papermc-docker/1.17.1-R0.1-SNAPSHOT)|
|`1.17.1-openjdk`|![1.17.1-openjdk](https://img.shields.io/docker/image-size/sksat/papermc-docker/1.17.1-openjdk)|
|`1.17.1-openjdk-17-slim`|![1.17.1-openjdk-17-slim](https://img.shields.io/docker/image-size/sksat/papermc-docker/1.17.1-openjdk-17-slim)|
|`1.17.1-openjdk-17-slim-buster`|![1.17.1-openjdk-17-slim-buster](https://img.shields.io/docker/image-size/sksat/papermc-docker/1.17.1-openjdk-17-slim-buster)|
|`1.17.1-openjdk-17-oraclelinux8`|![1.17.1-openjdk-17-oraclelinux8](https://img.shields.io/docker/image-size/sksat/papermc-docker/1.17.1-openjdk-17-oraclelinux8)|
|`1.17.1-temurin-17.0.1_12-jdk`|![1.17.1-temurin-17.0.1_12-jdk](https://img.shields.io/docker/image-size/sksat/papermc-docker/1.17.1-temurin-17.0.1_12-jdk)|
|`1.17.1-temurin-17.0.1_12-jdk-focal`|![1.17.1-temurin-17.0.1_12-jdk-focal](https://img.shields.io/docker/image-size/sksat/papermc-docker/1.17.1-temurin-17.0.1_12-jdk-focal)|
|`1.18`|![1.18](https://img.shields.io/docker/image-size/sksat/papermc-docker/1.18)|
|`1.18-R0.1-SNAPSHOT`|![1.18-R0.1-SNAPSHOT](https://img.shields.io/docker/image-size/sksat/papermc-docker/1.18-R0.1-SNAPSHOT)|
|`1.18-openjdk`|![1.18-openjdk](https://img.shields.io/docker/image-size/sksat/papermc-docker/1.18-openjdk)|
|`1.18-openjdk-17-slim`|![1.18-openjdk-17-slim](https://img.shields.io/docker/image-size/sksat/papermc-docker/1.18-openjdk-17-slim)|
|`1.18-openjdk-17-slim-buster`|![1.18-openjdk-17-slim-buster](https://img.shields.io/docker/image-size/sksat/papermc-docker/1.18-openjdk-17-slim-buster)|
|`1.18-openjdk-17-oraclelinux8`|![1.18-openjdk-17-oraclelinux8](https://img.shields.io/docker/image-size/sksat/papermc-docker/1.18-openjdk-17-oraclelinux8)|
|`1.18-temurin-17.0.1_12-jdk`|![1.18-temurin-17.0.1_12-jdk](https://img.shields.io/docker/image-size/sksat/papermc-docker/1.18-temurin-17.0.1_12-jdk)|
|`1.18-temurin-17.0.1_12-jdk-focal`|![1.18-temurin-17.0.1_12-jdk-focal](https://img.shields.io/docker/image-size/sksat/papermc-docker/1.18-temurin-17.0.1_12-jdk-focal)|


### Tags
Expand All @@ -31,14 +31,14 @@ tag structure: `<branch>-<Minecraft version>-<JDK>-<base-img>`
Some fields have default value.
If the tag contains a default value, there are other versions of tags that do not include that field.

Example: `main-1.17.1-R0.1-SNAPSHOT-d0a2193-alpine-jre` -> `1.17.1-alpine`
Example: `main-1.18-R0.1-SNAPSHOT-d0a2193-alpine-jre` -> `1.18-alpine`

- tag field

|field|detail|default value|example|
|-|-|-|-|
|branch|branch name|`main`|`renovate/openjdk-17-slim`|
|Minecraft version|Minecraft(PaperMC) version|N/A|`1.17.1`,`1.17.1-R0.1-SNAPSHOT`,`1.17.1-R0.1-SNAPSHOT-d0a2193`|
|Minecraft version|Minecraft(PaperMC) version|N/A|`1.18`,`1.18-R0.1-SNAPSHOT`,`1.18-R0.1-SNAPSHOT-0cd411e`|
|JDK|OpenJDK or Eclipse temurin|`openjdk`|`temurin`,`openjdk`|
|base-img|Base Image|It depends on JDK. `openjdk`->`17-slim`|

Expand Down
5 changes: 3 additions & 2 deletions utils/build-paper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ diff <(echo $MINECRAFT_VERSION) <(cat gradle.properties | grep 'mcVersion =' | s
diff <(echo $PAPER_VERSION) <(cat gradle.properties | grep 'version =' | sed -e 's/version = //')

./gradlew tasks
time ./gradlew applyPatches && time ./gradlew paperclipJar
time ./gradlew applyPatches
time ./gradlew createReobfPaperclipJar

find . | grep jar
ls build/libs -lh
cp build/libs/Paper-${PAPER_VERSION}.jar paperclip.jar
cp build/libs/paper-paperclip-${PAPER_VERSION}-reobf.jar paperclip.jar
cp paperclip.jar paperclip-${PAPER_COMMIT}.jar