Commit Graph

  • 6e2b3ae0c7 docs: Added java15-openj9 Geoff Bourne 2021-03-06 17:26:08 -06:00
  • af38a8fc7a ci: removed armv7 build since 15-openj9 doesn't include it Geoff Bourne 2021-03-06 17:27:08 -06:00
  • 58fa3c897d Merge branch 'master' into java15-openj9 Geoff Bourne 2021-03-06 17:23:02 -06:00
  • e45621d8e2 ci: Added java15-openj9 branch Geoff Bourne 2021-03-06 17:22:36 -06:00
  • 9915929340 ci: Added java15-openj9 Geoff Bourne 2021-03-06 16:53:46 -06:00
  • 26e75f29ba Merge branch 'master' into multiarch-latest Geoff Bourne 2021-03-06 16:28:10 -06:00
  • 298bf5fb0a Merge branch 'master' into multiarch Geoff Bourne 2021-03-06 16:27:57 -06:00
  • 192f004913 Merge branch 'master' into openj9-11 Geoff Bourne 2021-03-06 16:27:43 -06:00
  • d339a14253 Merge branch 'master' into openj9 Geoff Bourne 2021-03-06 16:25:56 -06:00
  • c784e4c432 Merge branch 'master' into adopt11 Geoff Bourne 2021-03-06 16:25:37 -06:00
  • 6ae431b2f0 Merge branch 'master' into java15 Geoff Bourne 2021-03-06 16:25:21 -06:00
  • 1c63cd18b7 Merge branch 'master' into java8-multiarch Geoff Bourne 2021-03-06 16:24:55 -06:00
  • a9a86d249b Merge branch 'master' into java8 Geoff Bourne 2021-03-06 16:23:07 -06:00
  • 43b090019d Shifted PATH-fix earlier in startup Geoff Bourne 2021-03-06 16:07:04 -06:00
  • 44769b6001 Shifted PATH-fix earlier in startup Geoff Bourne 2021-03-06 16:06:43 -06:00
  • 5920d41fe6 Shifted PATH-fix earlier in startup Geoff Bourne 2021-03-06 16:06:19 -06:00
  • a4e925c5e2 Shifted PATH-fix earlier in startup Geoff Bourne 2021-03-06 16:05:49 -06:00
  • 5254318f67 Shifted PATH-fix earlier in startup Geoff Bourne 2021-03-06 16:05:21 -06:00
  • ebabfeb669 Shifted PATH-fix earlier in startup Geoff Bourne 2021-03-06 16:05:01 -06:00
  • 6266a7e3cc Shifted PATH-fix earlier in startup Geoff Bourne 2021-03-06 16:04:31 -06:00
  • 595760d301 Shifted PATH-fix earlier in startup Geoff Bourne 2021-03-06 16:04:06 -06:00
  • 5c1f176848 Shifted PATH-fix earlier in startup Geoff Bourne 2021-03-06 16:03:37 -06:00
  • a9fec728e1 Ensure FTBA version.json is readable #784 Geoff Bourne 2021-02-27 16:58:25 -06:00
  • e22dfa898d Auto-merging via docker-versions-create 2021.6.0-multiarch-latest Geoff Bourne 2021-02-27 20:56:33 -06:00
  • 4186cfd91c Auto-merging via docker-versions-create 2021.6.0-multiarch Geoff Bourne 2021-02-27 20:56:01 -06:00
  • 457e9b53c7 Auto-merging via docker-versions-create 2021.6.0-java15 Geoff Bourne 2021-02-27 20:55:30 -06:00
  • 71697d7bce Auto-merging via docker-versions-create 2021.6.0-adopt11 Geoff Bourne 2021-02-27 20:54:59 -06:00
  • 9892df4f48 Auto-merging via docker-versions-create 2021.6.0-openj9-11 Geoff Bourne 2021-02-27 20:54:28 -06:00
  • a609305fc3 Auto-merging via docker-versions-create 2021.6.0-openj9 Geoff Bourne 2021-02-27 20:53:57 -06:00
  • 871ecd4d9d Merge branch 'master' into java8-multiarch 2021.6.0-java8-multiarch Geoff Bourne 2021-02-27 20:52:36 -06:00
  • 6d3f194ce3 Merge from master 2021.6.0-java8 Geoff Bourne 2021-02-27 20:47:00 -06:00
  • 861aec6bd6 Added option for MOHIST_BUILD #781 2021.6.0 Geoff Bourne 2021-02-27 20:37:59 -06:00
  • 21572d3547 Ensure FTBA version.json is readable #784 Geoff Bourne 2021-02-27 16:58:25 -06:00
  • 89afba7437 Ensure FTBA version.json is readable #784 Geoff Bourne 2021-02-27 16:58:25 -06:00
  • c572c95161 Ensure FTBA version.json is readable #784 Geoff Bourne 2021-02-27 16:58:25 -06:00
  • 53f5fbb77f docs: Fixed examples of quoting SEED and MOTD #782 Geoff Bourne 2021-02-27 11:05:16 -06:00
  • 9299f00d20 Pre-process special characters in REPLACE_ENV_VARIABLES #718 Geoff Bourne 2021-02-25 19:07:16 -06:00
  • e5e97a3560 Use file to speed up removal of old PaperMC server jars #779 Geoff Bourne 2021-02-23 20:04:34 -06:00
  • 32bc0382d6 Only show skipped properties when debugging Geoff Bourne 2021-02-21 14:36:03 -06:00
  • fa53abdfb7 Add missing server.properties when needed #776 Geoff Bourne 2021-02-21 14:32:41 -06:00
  • 0cbfb81b4c misc: Removed debug Geoff Bourne 2021-02-20 17:35:26 -06:00
  • d47c801b18 Separated JMX_BINDING from JMX_HOST in ENABLE_JMX usage Geoff Bourne 2021-02-20 17:34:00 -06:00
  • c056b9d2dd Improved handling of ENV_VARIABLE_PREFIX #718 Geoff Bourne 2021-02-20 17:30:50 -06:00
  • 92a15ea85d Updated forge examples to use java8 image #770 Geoff Bourne 2021-02-15 10:21:18 -06:00
  • 6fe022ccc8 Fix README: volume should be in list (#767) Fersandi Pratama 2021-02-14 01:24:58 +07:00
  • 21c1620f0c misc: java is actually found in /usr/bin by default Geoff Bourne 2021-02-11 15:05:45 -06:00
  • f397dd71a9 Fix PATH to include java when needed Geoff Bourne 2021-02-11 14:52:51 -06:00
  • b71eb666a7 Fix PATH to include java when needed #749 Geoff Bourne 2021-02-10 14:46:09 -06:00
  • c353752c0c Merge branch 'master' into multiarch-latest 2021.5.1-multiarch-latest Geoff Bourne 2021-02-10 14:59:41 -06:00
  • 02e0a47a52 Merge branch master 2021.5.1-multiarch Geoff Bourne 2021-02-10 14:58:33 -06:00
  • 6fd01d662f Merge branch 'master' into openj9-11 2021.5.1-openj9-11 Geoff Bourne 2021-02-10 14:57:02 -06:00
  • c47c28a211 Merge branch 'master' into openj9 2021.5.1-openj9 Geoff Bourne 2021-02-10 14:54:54 -06:00
  • a598ef7f50 Merge branch 'master' into adopt11 2021.5.1-adopt11 Geoff Bourne 2021-02-10 14:52:58 -06:00
  • b176be942d Fix PATH to include java when needed 2021.5.1-java15 Geoff Bourne 2021-02-10 14:52:16 -06:00
  • f7b58fbbb1 Fix PATH to include java when needed 2021.5.1-java8-multiarch Geoff Bourne 2021-02-10 14:51:24 -06:00
  • e78e5af96d Fix PATH to include java when needed 2021.5.1-java8 Geoff Bourne 2021-02-10 14:49:13 -06:00
  • a2ab0d75ed Fix PATH to include java when needed 2021.5.1 Geoff Bourne 2021-02-10 14:46:09 -06:00
  • b566c82892 Auto-merging via docker-versions-create 2021.5.0-multiarch-latest Geoff Bourne 2021-02-10 14:09:30 -06:00
  • 60809fe5ad Merge from master CONFLICT (content): Merge conflict in start-configuration 2021.5.0-multiarch Geoff Bourne 2021-02-10 14:08:21 -06:00
  • 51c5902db0 Merge from master CONFLICT (content): Merge conflict in start-configuration 2021.5.0-java15 Geoff Bourne 2021-02-10 14:06:10 -06:00
  • 580b506ab7 Auto-merging via docker-versions-create 2021.5.0-adopt11 Geoff Bourne 2021-02-10 14:03:36 -06:00
  • 2fc56067fa Auto-merging via docker-versions-create 2021.5.0-openj9-11 Geoff Bourne 2021-02-10 14:03:07 -06:00
  • b2aeaa0b51 Auto-merging via docker-versions-create 2021.5.0-openj9 Geoff Bourne 2021-02-10 14:02:35 -06:00
  • eccfa444a9 Auto-merging via docker-versions-create 2021.5.0-java8-multiarch Geoff Bourne 2021-02-10 14:02:05 -06:00
  • 0fb9700fc7 Auto-merging via docker-versions-create 2021.5.0-java8 Geoff Bourne 2021-02-10 14:01:35 -06:00
  • c48f6c31ce Missing EULA failed without proper log message #749 2021.5.0 Geoff Bourne 2021-02-10 13:57:14 -06:00
  • a4abb22690 Merge branch 'master' into multiarch-latest Geoff Bourne 2021-02-08 21:28:46 -06:00
  • b2d23edf6d ci: Added pull:true to multiarch build Geoff Bourne 2021-02-08 21:27:25 -06:00
  • e831d25706 Merged latest from master Geoff Bourne 2021-02-08 21:18:28 -06:00
  • 18925ef32c Merged latest from master Geoff Bourne 2021-02-08 21:16:50 -06:00
  • 31f25cfd1b Added java8 recommendation to CURSEFORGE / FTB Geoff Bourne 2021-02-08 21:15:28 -06:00
  • 7d4e4c167e Added support for Yatopia #704 Geoff Bourne 2021-02-08 20:42:54 -06:00
  • 6a9551fafe Auto-merging via docker-versions-create CONFLICT (content): Merge conflict in Dockerfile 2021.4.0-multiarch-latest Geoff Bourne 2021-02-07 18:23:57 -06:00
  • 4a8e416fe1 Auto-merging via docker-versions-create CONFLICT (content): Merge conflict in Dockerfile 2021.4.0-multiarch Geoff Bourne 2021-02-07 18:22:16 -06:00
  • 090e624ebc Auto-merging via docker-versions-create CONFLICT (content): Merge conflict in Dockerfile 2021.4.0-java15 Geoff Bourne 2021-02-07 18:20:35 -06:00
  • e0874a9241 Auto-merging via docker-versions-create 2021.4.0-adopt11 Geoff Bourne 2021-02-07 18:19:31 -06:00
  • 01fb2e1947 Auto-merging via docker-versions-create CONFLICT (content): Merge conflict in Dockerfile 2021.4.0-openj9-11 Geoff Bourne 2021-02-07 18:18:18 -06:00
  • c3711e5240 Auto-merging via docker-versions-create CONFLICT (content): Merge conflict in Dockerfile 2021.4.0-openj9 Geoff Bourne 2021-02-07 18:08:12 -06:00
  • 12e931332b Auto-merging via docker-versions-create CONFLICT (content): Merge conflict in Dockerfile 2021.4.0-java8-multiarch Geoff Bourne 2021-02-07 18:06:06 -06:00
  • f06b990f8a Auto-merging via docker-versions-create 2021.4.0-java8 Geoff Bourne 2021-02-07 18:03:40 -06:00
  • eb12030975 Update Invalid Server Type Logging Message (#758) 2021.4.0 LichLord91 2021-02-07 16:00:53 -08:00
  • e46af9d54c Fixed vanilla version lookup to fail early #756 Geoff Bourne 2021-02-07 17:58:50 -06:00
  • 861faaa285 Trimmed back some ENV defaults from Dockerfile Geoff Bourne 2021-02-07 17:52:42 -06:00
  • 8312233a93 Added support for Purpur servers #746 Geoff Bourne 2021-02-07 11:22:08 -06:00
  • 75844ae81a Fix java8 base image to actually be Java 8 #753 Geoff Bourne 2021-02-07 11:10:38 -06:00
  • 959bf73485 Limit depth when finding old PaperMC server jars Fixes #750 Geoff Bourne 2021-02-07 09:26:37 -06:00
  • e8061c08f7 Auto-merging docker-versions-create.sh CONFLICT (content): Merge conflict in Dockerfile 2021.3.0-multiarch-latest Geoff Bourne 2021-02-07 09:18:13 -06:00
  • ce4efd0b70 Auto-merging docker-versions-create.sh CONFLICT (content): Merge conflict in Dockerfile 2021.3.0-multiarch Geoff Bourne 2021-02-07 09:16:33 -06:00
  • c8dc751b82 Auto-merging docker-versions-create.sh CONFLICT (content): Merge conflict in Dockerfile 2021.3.0-java15 Geoff Bourne 2021-02-07 09:15:01 -06:00
  • b351205a05 Auto-merging via docker-versions-create 2021.3.0-adopt11 Geoff Bourne 2021-02-07 09:13:41 -06:00
  • 34edb10571 Auto-merging docker-versions-create.sh CONFLICT (content): Merge conflict in Dockerfile CONFLICT (add/add): Merge conflict in .github/workflows/build-multiarch.yml 2021.3.0-openj9-11 Geoff Bourne 2021-02-07 09:12:30 -06:00
  • 895bbd713e Auto-merging docker-versions-create.sh CONFLICT (content): Merge conflict in Dockerfile CONFLICT (add/add): Merge conflict in .github/workflows/build-multiarch.yml 2021.3.0-openj9 Geoff Bourne 2021-02-07 09:10:34 -06:00
  • 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 Geoff Bourne 2021-02-07 09:07:30 -06:00
  • ceee9eddc9 ci: restored base image to ubuntu and install openjdk-8 2021.3.0-java8-multiarch Geoff Bourne 2021-02-06 15:53:59 -06:00
  • 60ba668743 Merge branch 'master' into java8-multiarch Geoff Bourne 2021-02-06 15:49:16 -06:00
  • beeaf1a996 ci: Added java8-multiarch to build and docs 2021.3.0 Geoff Bourne 2021-02-06 15:48:27 -06:00
  • fd1b15e01f ci: Added java8 variant of multiarch Geoff Bourne 2021-02-06 15:44:02 -06:00
  • f856276d71 Upgraded multiarch to Java 11 Geoff Bourne 2021-02-01 17:29:09 -06:00
  • 0300854c46 Merge branch 'master' into multiarch Geoff Bourne 2021-02-06 15:21:53 -06:00
  • 96aa1054dc Upgraded mainline/latest to Java 11 Geoff Bourne 2021-01-30 16:16:36 -06:00