Commit Graph

  • 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
  • f927933c46 Added openj9 JDK11 variant For #721 Geoff Bourne 2021-01-12 17:18:08 -06:00
  • bd8c630f45 ci: Added openj9 JDK11 branch Geoff Bourne 2021-01-12 17:15:18 -06:00
  • 8f15aac6fc Merge branch 'multiarch' into multiarch-latest Geoff Bourne 2021-01-12 17:06:00 -06:00
  • b519c43e16 fix multiarch autopause daemon (#722) Michael Kirsch 2021-01-12 23:05:12 +01:00
  • 5ab83bcb21 ci: Switched build to docker/build-push-action@v2 Geoff Bourne 2021-01-09 14:13:18 -06:00
  • 84ce3b4b47 Merge branch 'multiarch' into multiarch-latest Geoff Bourne 2021-01-09 14:07:31 -06:00
  • 02c8393bc6 ci: Added opencontainers labels Geoff Bourne 2021-01-09 14:07:05 -06:00
  • b07c43a32f Merge branch 'multiarch' into multiarch-latest Geoff Bourne 2021-01-09 12:31:20 -06:00
  • 9469291731 ci: Switched multiarch build caching to github actions Geoff Bourne 2021-01-09 12:28:27 -06:00
  • ce1b337f7f Auto-merging via docker-versions-create 2021.1.0-multiarch-latest Geoff Bourne 2021-01-09 11:25:38 -06:00
  • c29baf446d Auto-merging via docker-versions-create 2021.1.0-multiarch Geoff Bourne 2021-01-09 11:24:53 -06:00
  • 6608209e5e Auto-merging via docker-versions-create 2021.1.0-adopt15 Geoff Bourne 2021-01-09 11:24:02 -06:00
  • 45348b443f Auto-merging via docker-versions-create 2021.1.0-adopt14 Geoff Bourne 2021-01-09 11:23:19 -06:00
  • e6a5a95ce4 Auto-merging via docker-versions-create 2021.1.0-adopt13 Geoff Bourne 2021-01-09 11:22:37 -06:00
  • 6e079c46c2 Auto-merging via docker-versions-create 2021.1.0-adopt11 Geoff Bourne 2021-01-09 11:21:56 -06:00
  • 1f0c0f5e17 Auto-merging via docker-versions-create 2021.1.0-openj9-nightly Geoff Bourne 2021-01-09 11:21:12 -06:00
  • 84bc92975c Auto-merging via docker-versions-create 2021.1.0-openj9 Geoff Bourne 2021-01-09 11:20:26 -06:00
  • fdf5fb46bc fix/681 (#719) 2021.1.0 Dubhar 2021-01-09 18:03:21 +01:00
  • 8c6ca5e999 Restored the ability for PAPERBUILD to be used with TYPE=PAPER For #715 Geoff Bourne 2021-01-07 20:03:42 -06:00
  • bb2b9eeea9 docs: Changed FORGEVERSION example to use a valid combination For #716 Geoff Bourne 2021-01-07 11:02:19 -06:00
  • d1cbce3f89 docs: Clarified usage of VERSION with FORGE type For #716 Geoff Bourne 2021-01-06 22:49:22 -06:00
  • 55b5f6821f Fixed ops and white-list setup for CurseForge modpacks named with spaces For #717 Geoff Bourne 2021-01-06 22:38:18 -06:00
  • ee8e1b9322 Merged latest from master 1.13.0-multiarch-latest Geoff Bourne 2021-01-06 22:16:40 -06:00
  • f9b8db0715 Merged master 1.13.0-multiarch Geoff Bourne 2021-01-06 22:14:46 -06:00
  • c8b23143b7 Auto-merging via docker-versions-create 1.13.0-adopt15 Geoff Bourne 2021-01-06 22:05:34 -06:00
  • 1594fd4ae8 Auto-merging via docker-versions-create 1.13.0-adopt14 Geoff Bourne 2021-01-06 22:04:59 -06:00
  • 2cc4f8e55a Auto-merging via docker-versions-create 1.13.0-adopt13 Geoff Bourne 2021-01-06 22:04:24 -06:00
  • 0d8d85876a Auto-merging via docker-versions-create 1.13.0-adopt11 Geoff Bourne 2021-01-06 22:03:50 -06:00
  • 9c626dcc8a Auto-merging via docker-versions-create 1.13.0-openj9-nightly Geoff Bourne 2021-01-06 22:03:16 -06:00
  • 5739b74aa3 Auto-merging via docker-versions-create 1.13.0-openj9 Geoff Bourne 2021-01-06 22:02:46 -06:00
  • 2fb01b4adf Autopause update: allow network interface selection (#711) 1.13.0 Michael Kirsch 2021-01-02 18:27:03 +01:00
  • 02bce8c3a8 docs: Documented adopt15 and multiarch-latest tags Geoff Bourne 2021-01-02 11:12:07 -06:00
  • 468671a3fa Update README.md (#712) Nathanial L. McConnell 2021-01-01 16:23:04 -05:00
  • 20bd5c4c36 Merge branch 'multiarch' into multiarch-latest Geoff Bourne 2020-12-31 13:19:34 -06:00
  • ffb50cfe28 Fixing AUTOPAUSE on Raspberry Pi 4s (#708) ErstBlack 2020-12-31 14:15:44 -05:00
  • 8ee650f38d Allowed CF_BASE_DIR/FTB_BASE_DIR to be configured For #518 Geoff Bourne 2020-12-31 13:11:26 -06:00
  • 3de2bf88df Escaped backslashes when setting server property value (#706) Geoff Bourne 2020-12-30 09:42:29 -06:00
  • 1fcbd8410f Allow CUSTOM_SERVER to reference not-yet-existing file from GENERIC_PACK For #703 Geoff Bourne 2020-12-29 10:56:05 -06:00
  • de082d0fb2 Merge branch 'multiarch' into multiarch-latest Geoff Bourne 2020-12-28 11:44:41 -06:00
  • 51e6d5dfbd Added install of sudo For #699 Geoff Bourne 2020-12-28 11:42:54 -06:00
  • 3cc5cdbc06 Auto-merging via docker-versions-create 1.12.0-multiarch-latest Geoff Bourne 2020-12-27 22:08:29 -06:00
  • 842c69fd80 Auto-merging via docker-versions-create 1.12.0-multiarch Geoff Bourne 2020-12-27 22:08:02 -06:00
  • 92e72bdeec Auto-merging via docker-versions-create 1.12.0-adopt15 Geoff Bourne 2020-12-27 22:07:32 -06:00