Auto-merging via docker-versions-create

2026-04-14 09:38:56 +00:00 · 2022-02-05 22:52:42 -06:00
parent 306671ffe7 eb6c7c98f0
commit 68b926f2b1
11 changed files with 67 additions and 19 deletions
--- a/tests/setuponlytests/forgeapimods_file/docker-compose.disabled.yml
+++ b/tests/setuponlytests/forgeapimods_file/docker-compose.disabled.yml
--- a/tests/setuponlytests/forgeapimods_projectids/docker-compose.disabled.yml
+++ b/tests/setuponlytests/forgeapimods_projectids/docker-compose.disabled.yml
--- a/tests/setuponlytests/generic-packs/docker-compose.yml
+++ b/tests/setuponlytests/generic-packs/docker-compose.yml
@@ -11,8 +11,14 @@ services:
    image: ${IMAGE_TO_TEST:-itzg/minecraft-server}
    environment:
      EULA: "true"
-      SETUP_ONLY: "TRUE"
+      SETUP_ONLY: "true"
      GENERIC_PACKS: http://web/configs.zip,/packs/testing.zip
+      LOG_TIMESTAMP: "true"
+      # the following are only used to speed up test execution
+      TYPE: CUSTOM
+      CUSTOM_SERVER: /servers/fake.jar
+      VERSION: 1.18.1
    volumes:
      - ./packs:/packs
      - ./data:/data
+      - ./fake.jar:/servers/fake.jar
--- a/tests/setuponlytests/generic-packs/fake.jar
+++ b/tests/setuponlytests/generic-packs/fake.jar