add jq as dependency

rcannood · rcannood · commit 14ae37bd5e3c · 2026-02-25T14:42:34.000+01:00
diff --git a/src/test/resources/test_languages/bash/config.vsh.yaml b/src/test/resources/test_languages/bash/config.vsh.yaml
@@ -8,11 +8,16 @@ engines:
   - type: native
   - type: docker
     image: "bash:3.2"
+    setup:
+      - type: apk
+        packages:
+          - jq
   - type: docker
     image: "bash:3.2"
     id: "throwawayimage"
     target_image: "throwawayimage"
     setup:
       - type: apk
         packages:
+          - jq
           - fortune
diff --git a/src/test/resources/test_languages/executable/config.vsh.yaml b/src/test/resources/test_languages/executable/config.vsh.yaml
@@ -22,3 +22,7 @@ engines:
   - type: native
   - type: docker
     image: "bash:3.2"
+    setup:
+      - type: apk
+        packages:
+          - jq
diff --git a/src/test/resources/testbash/auxiliary_requirements/config_requirements.vsh.yaml b/src/test/resources/testbash/auxiliary_requirements/config_requirements.vsh.yaml
@@ -24,3 +24,7 @@ test_resources:
 engines:
   - type: docker
     image: "bash:3.2"
+    setup:
+      - type: apk
+        packages:
+          - jq
diff --git a/src/test/resources/testbash/auxiliary_resource/config_resource_test.vsh.yaml b/src/test/resources/testbash/auxiliary_resource/config_resource_test.vsh.yaml
@@ -40,3 +40,7 @@ engines:
   - type: native
   - type: docker
     image: "bash:3.2"
+    setup:
+      - type: apk
+        packages:
+          - jq
diff --git a/src/test/resources/testbash/auxiliary_tag/config_bash_tag.vsh.yaml b/src/test/resources/testbash/auxiliary_tag/config_bash_tag.vsh.yaml
@@ -13,13 +13,24 @@ engines:
   - id: "testtag1"
     type: docker
     image: "bash:5.0"
+    setup:
+      - type: apk
+        packages:
+          - jq
   - id: "testtag2"
     type: docker
     image: "bash:3.2"
+    setup:
+      - type: apk
+        packages:
+          - jq
   - id: "testtargetimage1"
     type: docker
     image: "bash:5.0"
     setup:
+      - type: apk
+        packages:
+          - jq
       - type: docker
         run: [ ls ]
   - id: "testtargetimage2"
@@ -29,6 +40,9 @@ engines:
     target_registry: foo.io
     target_tag: 0.0.1
     setup:
+      - type: apk
+        packages:
+          - jq
       - type: docker
         run: [ ls ]
   - id: "testtargetimage3"
@@ -37,6 +51,9 @@ engines:
     target_image: bar
     target_tag: 0.0.2
     setup:
+      - type: apk
+        packages:
+          - jq
       - type: docker
         run: [ ls ]
 
diff --git a/src/test/resources/testbash/config.vsh.yaml b/src/test/resources/testbash/config.vsh.yaml
@@ -104,11 +104,16 @@ engines:
     id: native
   - type: docker
     image: "bash:3.2"
+    setup:
+      - type: apk
+        packages:
+          - jq
   - type: docker
     id: throwawayimage
     image: "bash:3.2"
     target_image: "mytestbash"
     setup:
       - type: apk
         packages:
+          - jq
           - fortune
diff --git a/src/test/resources/testnextflowvdsl3/src/integer_as_double/config.vsh.yaml b/src/test/resources/testnextflowvdsl3/src/integer_as_double/config.vsh.yaml
@@ -22,6 +22,10 @@ engines:
   - type: native
   - type: docker
     image: nextflow/bash:latest
+    setup:
+      - type: apk
+        packages:
+          - jq
 runners:
   - type: executable
   - type: nextflow
diff --git a/src/test/resources/testnextflowvdsl3/src/multiple_output/config.vsh.yaml b/src/test/resources/testnextflowvdsl3/src/multiple_output/config.vsh.yaml
@@ -21,6 +21,10 @@ engines:
   - type: native
   - type: docker
     image: nextflow/bash:latest
+    setup:
+      - type: apk
+        packages:
+          - jq
 runners:
   - type: executable
   - type: nextflow
diff --git a/src/test/resources/testnextflowvdsl3/src/step1/config.vsh.yaml b/src/test/resources/testnextflowvdsl3/src/step1/config.vsh.yaml
@@ -18,5 +18,9 @@ engines:
   - type: native
   - type: docker
     image: nextflow/bash:latest
+    setup:
+      - type: apk
+        packages:
+          - jq
 runners:
   - type: nextflow
diff --git a/src/test/resources/testnextflowvdsl3/src/step2/config.vsh.yaml b/src/test/resources/testnextflowvdsl3/src/step2/config.vsh.yaml
@@ -60,5 +60,9 @@ engines:
   - type: native
   - type: docker
     image: nextflow/bash:latest
+    setup:
+      - type: apk
+        packages:
+          - jq
 runners:
   - type: nextflow
diff --git a/src/test/resources/testnextflowvdsl3/src/step3/config.vsh.yaml b/src/test/resources/testnextflowvdsl3/src/step3/config.vsh.yaml
@@ -18,5 +18,9 @@ engines:
   - type: native
   - type: docker
     image: nextflow/bash:latest
+    setup:
+      - type: apk
+        packages:
+          - jq
 runners:
   - type: nextflow
diff --git a/src/test/resources/verification/check_config/config.vsh.yaml b/src/test/resources/verification/check_config/config.vsh.yaml
@@ -18,6 +18,9 @@ engines:
   - type: docker
     image: node:20
     setup:
+      - type: apt
+        packages:
+          - jq
       - type: javascript
         # npm: ajv-cli
         npm: "@jirutka/ajv-cli@6.0.0-beta.5"
diff --git a/src/test/scala/io/viash/auxiliary/MainBuildAuxiliaryDockerChown.scala b/src/test/scala/io/viash/auxiliary/MainBuildAuxiliaryDockerChown.scala
@@ -39,7 +39,7 @@ class MainBuildAuxiliaryDockerChown extends AnyFunSuite with BeforeAndAfterAll w
     assert(amount > 0)
     assert(amount < 4)
 
-    val engineMod = s""".engines := [{"type": "docker", "image": "bash:3.2", "id": "$dockerId"}]"""
+    val engineMod = s""".engines := [{"type": "docker", "image": "bash:3.2", "id": "$dockerId", "setup": [{"type": "apk", "packages": ["jq"]}]}]"""
     val modsWithEngine = mods :+ engineMod
     val localConfigFile = configDeriver.derive(modsWithEngine, dockerId)
     val localConfig = Config.read(localConfigFile)
diff --git a/src/test/scala/io/viash/e2e/test/MainTestDockerSuite.scala b/src/test/scala/io/viash/e2e/test/MainTestDockerSuite.scala
@@ -68,7 +68,7 @@ class MainTestDockerSuite extends AnyFunSuite with BeforeAndAfterAll with Parall
   }
 
   test("Check setup strategy", DockerTest) {
-    val newConfigFilePath = configDeriver.derive(""".engines[.type == "docker" && !has(.id) ].setup := [{ type: "docker", run: "echo 'Hello world!'" }]""", "cache_config")
+    val newConfigFilePath = configDeriver.derive(""".engines[.type == "docker" && !has(.id) ].setup := [{ type: "apk", packages: ["jq"] }, { type: "docker", run: "echo 'Hello world!'" }]""", "cache_config")
     // first run to create cache entries
     val testOutput = TestHelper.testMain(
       "test",
