You've already forked sap-jenkins-library
mirror of
https://github.com/SAP/jenkins-library.git
synced 2025-09-16 09:26:22 +02:00
fix: b
This commit is contained in:
@@ -104,8 +104,8 @@ func runBuildahExecute(config *buildahExecuteOptions, telemetryData *telemetry.C
|
||||
"--security-opt=apparmor=unconfined", // Required for container operation
|
||||
"--security-opt=seccomp=unconfined", // Required for container operation
|
||||
"--storage-driver=vfs", // Use vfs storage driver explicitly
|
||||
"--pull=true", // Allow pulling base images
|
||||
"--layers=true", // Enable layer optimization
|
||||
"--pull=true", // Allow pulling base images
|
||||
"--layers=true", // Enable layer optimization
|
||||
"--volume", "/var/lib/containers:/var/lib/containers:rw,z", // Mount container storage with proper SELinux context
|
||||
}
|
||||
|
||||
|
@@ -343,7 +343,7 @@ func buildkitExecuteMetadata() config.StepData {
|
||||
},
|
||||
},
|
||||
Containers: []config.Container{
|
||||
{Name: "buildkitd", Image: "moby/buildkit:v0.12.0-rootless", EnvVars: []config.EnvVar{{Name: "HOME", Value: "/home/user"}, {Name: "USER", Value: "user"}, {Name: "XDG_RUNTIME_DIR", Value: "/home/user/.local/share"}, {Name: "BUILDKIT_HOST", Value: "unix:///home/user/.local/share/buildkit/buildkitd.sock"}}},
|
||||
{Name: "buildkitd", Image: "moby/buildkit:v0.12.0-rootless", EnvVars: []config.EnvVar{{Name: "HOME", Value: "/home/user"}, {Name: "USER", Value: "user"}, {Name: "XDG_RUNTIME_DIR", Value: "/home/user/.local/share"}, {Name: "BUILDKIT_HOST", Value: "unix:///home/user/.local/share/buildkit/buildkitd.sock"}, {Name: "BUILDKIT_STEP_LOG_MAX_SIZE", Value: "10485760"}, {Name: "BUILDKIT_STEP_LOG_MAX_SPEED", Value: "1048576"}}},
|
||||
},
|
||||
Outputs: config.StepOutputs{
|
||||
Resources: []config.StepResources{
|
||||
|
@@ -112,19 +112,20 @@ spec:
|
||||
- name: buildkitd
|
||||
image: moby/buildkit:v0.12.0-rootless
|
||||
command:
|
||||
- /usr/bin/rootlesskit
|
||||
- /bin/sh
|
||||
args:
|
||||
- --net=slirp4netns
|
||||
- --copy-up=/etc
|
||||
- --copy-up=/run
|
||||
- --propagation=rslave
|
||||
- buildkitd
|
||||
- --addr=unix:///run/buildkit/buildkitd.sock
|
||||
- --oci-worker-no-process-sandbox
|
||||
lifecycle:
|
||||
preStart:
|
||||
exec:
|
||||
command: ["/bin/sh", "-c", "mkdir -p /run/buildkit"]
|
||||
- -c
|
||||
- |
|
||||
mkdir -p /run/buildkit && \
|
||||
/usr/bin/rootlesskit \
|
||||
--net=slirp4netns \
|
||||
--copy-up=/etc \
|
||||
--copy-up=/run \
|
||||
--propagation=rslave \
|
||||
/usr/bin/buildkitd \
|
||||
--addr=unix:///run/buildkit/buildkitd.sock \
|
||||
--oci-worker-no-process-sandbox \
|
||||
--containerd-worker=false
|
||||
env:
|
||||
- name: HOME
|
||||
value: /home/user
|
||||
|
Reference in New Issue
Block a user