Merge branch 'master' into add-e2e-tests

seqeralabs · Jan 22, 2025 · 3ed4222 · 3ed4222
2 parents ce8c995 + facbf99
commit 3ed4222
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -51,7 +51,7 @@ wave:
   server:
       url: "${WAVE_SERVER_URL:`http://localhost:9090`}"
   build:
-    buildkit-image: "moby/buildkit:v0.14.1-rootless"
+    buildkit-image: "moby/buildkit:v0.18.2-rootless"
     singularity-image: "quay.io/singularity/singularity:v3.11.4-slim"
     singularity-image-arm64: "quay.io/singularity/singularity:v3.11.4-slim-arm64"
     repo: "195996028523.dkr.ecr.eu-west-1.amazonaws.com/wave/build/dev"

diff --git a/src/test/groovy/io/seqera/wave/service/builder/DockerBuildStrategyTest.groovy b/src/test/groovy/io/seqera/wave/service/builder/DockerBuildStrategyTest.groovy
@@ -51,7 +51,7 @@ class DockerBuildStrategyTest extends Specification {
                 '-v', '/work/foo:/work/foo',
                 '--entrypoint',
                 'buildctl-daemonless.sh',
-                'moby/buildkit:v0.14.1-rootless']
+                'moby/buildkit:v0.18.2-rootless']
 
         when:
         cmd = service.cmdForBuildkit('build-job-name', work, Path.of('/foo/creds.json'), ContainerPlatform.of('arm64'))
@@ -67,7 +67,7 @@ class DockerBuildStrategyTest extends Specification {
                 'buildctl-daemonless.sh',
                 '-v', '/foo/creds.json:/home/user/.docker/config.json:ro',
                 '--platform', 'linux/arm64',
-                'moby/buildkit:v0.14.1-rootless']
+                'moby/buildkit:v0.18.2-rootless']
 
         when:
         cmd = service.cmdForBuildkit('build-job-name', work, Path.of('/foo/creds.json'), null)
@@ -82,7 +82,7 @@ class DockerBuildStrategyTest extends Specification {
                 '--entrypoint',
                 'buildctl-daemonless.sh',
                 '-v', '/foo/creds.json:/home/user/.docker/config.json:ro',
-                'moby/buildkit:v0.14.1-rootless']
+                'moby/buildkit:v0.18.2-rootless']
 
         cleanup:
         ctx.close()
@@ -116,7 +116,7 @@ class DockerBuildStrategyTest extends Specification {
                 'buildctl-daemonless.sh',
                 '-v', '/work/creds.json:/home/user/.docker/config.json:ro',
                 '--platform', 'linux/amd64',
-                'moby/buildkit:v0.14.1-rootless',
+                'moby/buildkit:v0.18.2-rootless',
                 'build',
                 '--frontend',
                 'dockerfile.v0',

diff --git a/src/test/groovy/io/seqera/wave/service/builder/KubeBuildStrategyTest.groovy b/src/test/groovy/io/seqera/wave/service/builder/KubeBuildStrategyTest.groovy
@@ -99,7 +99,7 @@ class KubeBuildStrategyTest extends Specification {
         def req = new BuildRequest(containerId, dockerfile, null, PATH, targetImage, USER, ContainerPlatform.of('amd64'), cache, "10.20.30.40", '{"config":"json"}', null,null , null, null, BuildFormat.DOCKER, Duration.ofMinutes(1))
 
         then: 'should return buildkit image'
-        strategy.getBuildImage(req) == 'moby/buildkit:v0.14.1-rootless'
+        strategy.getBuildImage(req) == 'moby/buildkit:v0.18.2-rootless'
 
         when:'getting singularity with amd64 arch in build request'
         req = new BuildRequest(containerId, dockerfile, null, PATH, targetImage, USER, ContainerPlatform.of('amd64'), cache, "10.20.30.40", '{}', null,null , null, null, BuildFormat.SINGULARITY,Duration.ofMinutes(1))

diff --git a/src/test/groovy/io/seqera/wave/service/inspect/ContainerInspectServiceImplTest.groovy b/src/test/groovy/io/seqera/wave/service/inspect/ContainerInspectServiceImplTest.groovy
@@ -91,11 +91,11 @@ class ContainerInspectServiceImplTest extends Specification {
 
         and:
         ContainerInspectServiceImpl.findRepositories('''
-                FROM moby/buildkit:v0.14.1-rootless AS bkt
+                FROM moby/buildkit:v0.18.2-rootless AS bkt
                 RUN this and that
                 FROM amazoncorretto:17.0.4
                 COPY --from=bkt /usr/bin/buildctl /usr/bin/buildctl
-                ''') == ['moby/buildkit:v0.14.1-rootless', 'amazoncorretto:17.0.4']
+                ''') == ['moby/buildkit:v0.18.2-rootless', 'amazoncorretto:17.0.4']
 
     }