amorfo77/docker-minecraft-server
1
0
Fork 0
mirror of https://github.com/itzg/docker-minecraft-server.git synced 2026-02-27 11:26:24 +00:00
Code Issues Projects Releases Wiki Activity
1,578 Commits 35 Branches 526 Tags
2022.2.0-java8
Commit Graph

1578 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Bourne
0cbfb81b4c misc: Removed debug 2021-02-20 17:35:26 -06:00
Geoff Bourne
d47c801b18 Separated JMX_BINDING from JMX_HOST in ENABLE_JMX usage 2021-02-20 17:34:00 -06:00
Geoff Bourne
c056b9d2dd Improved handling of ENV_VARIABLE_PREFIX 
#718
 2021-02-20 17:30:50 -06:00
Geoff Bourne
92a15ea85d Updated forge examples to use java8 image 
#770
 2021-02-15 10:21:42 -06:00
Fersandi Pratama
6fe022ccc8 Fix README: volume should be in list (#767) 2021-02-13 12:24:58 -06:00
Geoff Bourne
21c1620f0c misc: java is actually found in /usr/bin by default 2021-02-11 15:05:45 -06:00
Geoff Bourne
f397dd71a9 Fix PATH to include java when needed 2021-02-11 14:52:51 -06:00
Geoff Bourne
b71eb666a7 Fix PATH to include java when needed 
#749
 2021-02-10 15:11:07 -06:00
Geoff Bourne
02e0a47a52 Merge branch master 2021.5.1-multiarch 2021-02-10 14:58:33 -06:00
Geoff Bourne
b176be942d Fix PATH to include java when needed 2021.5.1-java15 2021-02-10 14:52:16 -06:00
Geoff Bourne
e78e5af96d Fix PATH to include java when needed 2021.5.1-java8 2021-02-10 14:49:13 -06:00
Geoff Bourne
a2ab0d75ed Fix PATH to include java when needed 2021.5.1 2021-02-10 14:46:09 -06:00
Geoff Bourne
60809fe5ad Merge from master 
CONFLICT (content): Merge conflict in start-configuration
2021.5.0-multiarch 		2021-02-10 14:08:21 -06:00
Geoff Bourne
51c5902db0 Merge from master 
CONFLICT (content): Merge conflict in start-configuration
2021.5.0-java15 		2021-02-10 14:06:10 -06:00
Geoff Bourne
0fb9700fc7 Auto-merging via docker-versions-create 2021.5.0-java8 2021-02-10 14:01:35 -06:00
Geoff Bourne
c48f6c31ce Missing EULA failed without proper log message 
#749
2021.5.0 		2021-02-10 13:57:14 -06:00
Geoff Bourne
b2d23edf6d ci: Added pull:true to multiarch build 2021-02-08 21:27:25 -06:00
Geoff Bourne
18925ef32c Merged latest from master 2021-02-08 21:16:50 -06:00
Geoff Bourne
31f25cfd1b Added java8 recommendation to CURSEFORGE / FTB 2021-02-08 21:15:28 -06:00
Geoff Bourne
7d4e4c167e Added support for Yatopia 
#704
 2021-02-08 20:42:54 -06:00
Geoff Bourne
4a8e416fe1 Auto-merging via docker-versions-create 
CONFLICT (content): Merge conflict in Dockerfile
2021.4.0-multiarch 		2021-02-07 18:22:16 -06:00
Geoff Bourne
090e624ebc Auto-merging via docker-versions-create 
CONFLICT (content): Merge conflict in Dockerfile
2021.4.0-java15 		2021-02-07 18:20:35 -06:00
Geoff Bourne
f06b990f8a Auto-merging via docker-versions-create 2021.4.0-java8 2021-02-07 18:03:40 -06:00
LichLord91
eb12030975 Update Invalid Server Type Logging Message (#758) 
Includes Tuinity and Purpur

Co-authored-by: lichlord91 <lichlord91@users.noreply.github.com>
2021.4.0 		2021-02-07 18:00:53 -06:00
Geoff Bourne
e46af9d54c Fixed vanilla version lookup to fail early 
#756
 2021-02-07 17:58:50 -06:00
Geoff Bourne
861faaa285 Trimmed back some ENV defaults from Dockerfile 2021-02-07 17:52:42 -06:00
Geoff Bourne
8312233a93 Added support for Purpur servers 
#746
 2021-02-07 11:22:08 -06:00
Geoff Bourne
75844ae81a Fix java8 base image to actually be Java 8 
#753
 2021-02-07 11:10:38 -06:00
Geoff Bourne
959bf73485 Limit depth when finding old PaperMC server jars 
Fixes #750
 2021-02-07 09:26:37 -06:00
Geoff Bourne
ce4efd0b70 Auto-merging docker-versions-create.sh 
CONFLICT (content): Merge conflict in Dockerfile
2021.3.0-multiarch 		2021-02-07 09:16:33 -06:00
Geoff Bourne
c8dc751b82 Auto-merging docker-versions-create.sh 
CONFLICT (content): Merge conflict in Dockerfile
2021.3.0-java15 		2021-02-07 09:15:01 -06:00
Geoff Bourne
6bb2323c46 Auto-merging docker-versions-create.sh 
CONFLICT (content): Merge conflict in docker-versions-create.sh
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.
2021.3.0-java8 		2021-02-07 09:07:30 -06:00
Geoff Bourne
beeaf1a996 ci: Added java8-multiarch to build and docs 2021.3.0 2021-02-06 15:48:27 -06:00
Geoff Bourne
f856276d71 Upgraded multiarch to Java 11 2021-02-06 15:22:15 -06:00
Geoff Bourne
0300854c46 Merge branch 'master' into multiarch 2021-02-06 15:21:53 -06:00
Geoff Bourne
96aa1054dc Upgraded mainline/latest to Java 11 2021-02-06 15:21:20 -06:00
Geoff Bourne
7c862df92a Merge branch 'master' into java15 2021-02-06 15:12:45 -06:00
Geoff Bourne
e7937206af ci: Added java15 to multiarch build 2021-02-06 15:12:34 -06:00
Geoff Bourne
e49c1c2f01 Merge branch 'master' into java15 2021-02-06 15:11:34 -06:00
Geoff Bourne
081b2c11e4 ci: Introduced java15 branch 
ci: Deprecated adopt13, adopt14, openj9-nightly
 2021-02-06 15:11:03 -06:00
Geoff Bourne
f342f4aa98 ci: Introduced java15 branch 
ci: Deprecated adopt13, adopt14, openj9-nightly
 2021-02-06 15:07:42 -06:00
Geoff Bourne
57390b02ca Merge branch 'master' into java15 2021-02-06 14:53:02 -06:00
Geoff Bourne
f06e9f5ede Merge branch 'master' into multiarch 2021-02-06 14:52:35 -06:00
Geoff Bourne
4e73e69342 ci: Added build-multiarch.yml to align merges 2021-02-06 14:52:20 -06:00
Geoff Bourne
a698248dff ci: Based on adoptopenjdk:15-jre 2021-02-06 14:50:43 -06:00
Geoff Bourne
c6ff80b71c docs: Clarify MEMORY limits vs overall container memory 
Related to #691
 2021-02-01 21:15:33 -06:00
M*C*O
37cad3f255 docs: Document LEVEL_TYPE: BIOMESOP (#741) 2021-02-01 12:39:55 -06:00
Geoff Bourne
7814ca21b5 Merge branch 'master' into java8 
# Conflicts:
#	README.md
#	start-configuration
 2021-01-30 18:56:33 -06:00
Geoff Bourne
5700f36a6f Renamed forge branch to java8 2021-01-30 18:49:46 -06:00
Geoff Bourne
b8806629ec Merged latest from master 2021-01-30 16:48:11 -06:00