Commit Graph

  • 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
  • 7c862df92a Merge branch 'master' into java15 Geoff Bourne 2021-02-06 15:12:45 -06:00
  • e7937206af ci: Added java15 to multiarch build Geoff Bourne 2021-02-06 15:12:34 -06:00
  • e49c1c2f01 Merge branch 'master' into java15 Geoff Bourne 2021-02-06 15:11:34 -06:00
  • 081b2c11e4 ci: Introduced java15 branch ci: Deprecated adopt13, adopt14, openj9-nightly Geoff Bourne 2021-02-06 15:11:03 -06:00
  • f342f4aa98 ci: Introduced java15 branch ci: Deprecated adopt13, adopt14, openj9-nightly Geoff Bourne 2021-02-06 15:07:42 -06:00
  • 57390b02ca Merge branch 'master' into java15 Geoff Bourne 2021-02-06 14:53:02 -06:00
  • 2e085f174c Merge branch 'master' into multiarch-latest Geoff Bourne 2021-02-06 14:52:49 -06:00
  • f06e9f5ede Merge branch 'master' into multiarch Geoff Bourne 2021-02-06 14:52:35 -06:00
  • 4e73e69342 ci: Added build-multiarch.yml to align merges Geoff Bourne 2021-02-06 14:52:20 -06:00
  • a698248dff ci: Based on adoptopenjdk:15-jre Geoff Bourne 2021-02-06 14:50:43 -06:00
  • c6ff80b71c docs: Clarify MEMORY limits vs overall container memory Related to #691 Geoff Bourne 2021-02-01 21:15:33 -06:00
  • 37cad3f255 docs: Document LEVEL_TYPE: BIOMESOP (#741) M*C*O 2021-02-01 19:39:55 +01:00
  • 7814ca21b5 Merge branch 'master' into java8 Geoff Bourne 2021-01-30 18:55:19 -06:00
  • 5700f36a6f Renamed forge branch to java8 Geoff Bourne 2021-01-30 18:32:32 -06:00
  • b8806629ec Merged latest from master Geoff Bourne 2021-01-30 16:48:11 -06:00
  • 4a7f838a0f Upgraded mainline/latest to Java 11 Geoff Bourne 2021-01-30 16:16:36 -06:00
  • 34f800d815 ci: Added forge branch to builds Geoff Bourne 2021-01-30 16:02:15 -06:00
  • 2d07dee4df Prepared forge branch's Dockerfile Geoff Bourne 2021-01-30 15:58:03 -06:00
  • b8ef6eba3f Auto-merging via docker-versions-create 2021.2.0-multiarch-latest Geoff Bourne 2021-01-29 21:07:29 -06:00
  • 8d3ca813ed Auto-merging via docker-versions-create 2021.2.0-multiarch Geoff Bourne 2021-01-29 21:07:00 -06:00
  • eeeb0de45e Auto-merging via docker-versions-create 2021.2.0-adopt15 Geoff Bourne 2021-01-29 21:06:31 -06:00
  • 7233fc8c84 Auto-merging via docker-versions-create 2021.2.0-adopt14 Geoff Bourne 2021-01-29 21:06:03 -06:00
  • 4017ef54dd Auto-merging via docker-versions-create 2021.2.0-adopt13 Geoff Bourne 2021-01-29 21:05:35 -06:00
  • 526db33c8f Auto-merging via docker-versions-create 2021.2.0-adopt11 Geoff Bourne 2021-01-29 21:05:07 -06:00
  • 9c73bd11b7 Auto-merging via docker-versions-create 2021.2.0-openj9-nightly Geoff Bourne 2021-01-29 21:04:39 -06:00
  • 1de85d667f Auto-merging via docker-versions-create 2021.2.0-openj9-11 Geoff Bourne 2021-01-29 21:04:06 -06:00
  • a3542e9e0b Auto-merging via docker-versions-create 2021.2.0-openj9 Geoff Bourne 2021-01-29 21:03:36 -06:00
  • ffec50141a Fixed MODS provides from github release URLs For #731 2021.2.0 Geoff Bourne 2021-01-28 20:55:08 -06:00
  • 54027049d3 docs: Added compose example to data attaching section Geoff Bourne 2021-01-24 12:31:56 -06:00
  • 4c2829e3d2 docs: Added a simple docker compose example Geoff Bourne 2021-01-21 13:36:41 -06:00
  • 69e308d420 Split eula header into two lines of comments #728 - Found that https://github.com/Yoosk/ServerStarter hard coded expectation that eula property was on third line Geoff Bourne 2021-01-19 21:36:21 -06:00
  • ad46f10b55 Added option to override whitelist and ops files #726 Geoff Bourne 2021-01-17 10:09:41 -06:00
  • cd0fdfc95b Add an option to override the icon which already has been set. (#723) Eugene 2021-01-13 23:47:15 +01:00
  • d95abfce82 ci: Added openj9-11 tags pattern Geoff Bourne 2021-01-12 17:33:03 -06:00
  • 942a125e04 ci: Added non-versioned cache as restore-key fallback Geoff Bourne 2021-01-12 17:30:58 -06:00
  • cc5fe0859a Auto-merging via docker-versions-create Geoff Bourne 2021-01-12 17:28:33 -06:00
  • e97a00e61d Auto-merging via docker-versions-create Geoff Bourne 2021-01-12 17:28:11 -06:00
  • f60ab3b6db Auto-merging via docker-versions-create Geoff Bourne 2021-01-12 17:27:50 -06:00
  • bb0da9ef79 Auto-merging via docker-versions-create Geoff Bourne 2021-01-12 17:27:30 -06:00
  • eaf7b28ae9 Auto-merging via docker-versions-create Geoff Bourne 2021-01-12 17:27:09 -06:00
  • 3d7384f3e2 Auto-merging via docker-versions-create Geoff Bourne 2021-01-12 17:26:48 -06:00
  • 9e2b184f2a Auto-merging via docker-versions-create Geoff Bourne 2021-01-12 17:26:27 -06:00
  • 97cb1a8c87 Auto-merging via docker-versions-create Geoff Bourne 2021-01-12 17:26:05 -06:00
  • 23c0cd3017 Auto-merging via docker-versions-create Geoff Bourne 2021-01-12 17:25:45 -06:00
  • a3677d5aa8 ci: Enabled pull in build step Geoff Bourne 2021-01-12 17:20:57 -06:00