faas-rs/faasd
1
0
Fork 0
mirror of https://github.com/openfaas/faasd.git synced 2025-06-21 14:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implement read only flag

Browse Source 
Signed-off-by: Peter Mills <ptjm8422@gmail.com>
Signed-off-by: Alex Ellis (OpenFaaS Ltd) <alexellis2@gmail.com>
This commit is contained in:
Peter Mills
2023-09-12 20:34:25 +01:00
committed by Alex Ellis
parent ba601bfc67
commit aab5363e65
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/supervisor.go
View File

@ -57,8 +57,14 @@ type ServicePort struct {
} }
type Mount struct { type Mount struct {
// Src relative to the working directory for faasd
Src string Src string
// Dest is the absolute path within the container
Dest string Dest string
// ReadOnly when set to true indicates the mount will be set to "ro" instead of "rw"
ReadOnly bool
} }
type Supervisor struct { type Supervisor struct {
@ -151,11 +157,18 @@ func (s *Supervisor) Start(svcs []Service) error {
mounts := []specs.Mount{} mounts := []specs.Mount{}
if len(svc.Mounts) > 0 { if len(svc.Mounts) > 0 {
for _, mnt := range svc.Mounts { for _, mnt := range svc.Mounts {
var options = []string{"rbind"}
if mnt.ReadOnly {
options = append(options, "ro")
} else {
options = append(options, "rw")
}
mounts = append(mounts, specs.Mount{ mounts = append(mounts, specs.Mount{
Source: mnt.Src, Source: mnt.Src,
Destination: mnt.Dest, Destination: mnt.Dest,
Type: "bind", Type: "bind",
Options: []string{"rbind", "rw"}, Options: options,
}) })
// Only create directories, not files. // Only create directories, not files.
@ -344,6 +357,7 @@ func ParseCompose(config *compose.Config) ([]Service, error) {
mounts = append(mounts, Mount{ mounts = append(mounts, Mount{
Src: v.Source, Src: v.Source,
Dest: v.Target, Dest: v.Target,
ReadOnly: v.ReadOnly,
}) })
} }

2
pkg/supervisor_test.go
View File

@ -180,7 +180,7 @@ func equalMountSlice(t *testing.T, want, found []Mount) {
for i := range want { for i := range want {
if !reflect.DeepEqual(want[i], found[i]) { if !reflect.DeepEqual(want[i], found[i]) {
t.Fatalf("unexpected value at postition %d: want %s, got %s", i, want[i], found[i]) t.Fatalf("unexpected value at postition %d: want %v, got %v", i, want[i], found[i])
} }
} }
} }