Skip to content

Commit 72726b3

Browse files
authored
Fix segment fault with mapfs (#964)
Fix segment fault with mapfs, fusesidecar image is released separately to gcr.io/kf-releases/fusesidecar:v2.11.14
1 parent 4741d1a commit 72726b3

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

docs/content/en/docs/v2.11/examples/deploying-docker-apps-with-nfs-mapfs.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ First, you'll need to update your Dockerfile to add the `mapfs` binary to your a
3434

3535
```dockerfile
3636
# Get the mapfs binrary from a version of Kf.
37-
FROM gcr.io/kf-releases/fusesidecar:v2.11.2 as builder
37+
FROM gcr.io/kf-releases/fusesidecar:v2.11.14 as builder
3838
COPY --from=builder --chown=root:vcap /bin/mapfs /bin/mapfs
3939

4040
# Allow users other than root to use fuse.

pkg/reconciler/build/resources/builtin_tasks.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ chmod a+x /workspace/entrypoint.bash
156156
start_cmd=$(cat /tmp/result.json | jq .process_types.web)
157157
158158
cat << EOF > /workspace/Dockerfile
159-
FROM gcr.io/kf-releases/fusesidecar:v2.11.2 as builder
159+
FROM gcr.io/kf-releases/fusesidecar:v2.11.14 as builder
160160
161161
FROM $(inputs.params.RUN_IMAGE)
162162
COPY launcher /lifecycle/launcher

third_party/mapfs/src/mapfs/mapfs.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,8 @@ func (fs *mapFileSystem) StatFs(name string) *fuse.StatfsOut {
288288
}
289289

290290
stats := fs.FileSystem.StatFs(name)
291-
stats.Bfree = stats.Blocks
291+
if stats != nil {
292+
stats.Bfree = stats.Blocks
293+
}
292294
return stats
293295
}

0 commit comments

Comments
 (0)