Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump buildkit to version 0.18.2 #787

Merged
merged 4 commits into from
Jan 21, 2025
+8 −8
Merged

Bump buildkit to version 0.18.2 #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be05fb8
Bump buildkit to version 0.18.2
pditommaso Jan 13, 2025
bcdf4cc
Merge branch 'master' into bump-buildkit-0.18.2
munishchouhan Jan 21, 2025
b28834b
[release] bump 1.16.9-A0
munishchouhan Jan 21, 2025
e51124f
reverted Version [ci skip]
munishchouhan Jan 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/resources/application.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions src/test/groovy/io/seqera/wave/service/builder/DockerBuildStrategyTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Expand All @@ -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)
Expand All @@ -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()
Expand Down Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/io/seqera/wave/service/builder/KubeBuildStrategyTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
4 changes: 2 additions & 2 deletions src/test/groovy/io/seqera/wave/service/inspect/ContainerInspectServiceImplTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']

}

Expand Down