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

Ntate/appdev/macossupport #1235

Merged
merged 2 commits into from
Sep 19, 2022
Merged

Ntate/appdev/macossupport #1235

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f6524c
mount docker.sock.raw for mac docker-for-desktop
nicktate Sep 16, 2022
6a4ab27
update local builder to v0.50.2
nicktate Sep 19, 2022
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
16 changes: 12 additions & 4 deletions internal/apps/builder/cnb.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"errors"
"fmt"
"path/filepath"
"runtime"
"sort"
"strings"
"time"
Expand All @@ -24,7 +25,7 @@ import (

const (
// CNBBuilderImage represents the local cnb builder.
CNBBuilderImage = "digitaloceanapps/cnb-local-builder:v0.49.0"
CNBBuilderImage = "digitaloceanapps/cnb-local-builder:v0.50.2"

appVarAllowListKey = "APP_VARS"
appVarPrefix = "APP_VAR_"
Expand Down Expand Up @@ -63,9 +64,16 @@ func (b *CNBComponentBuilder) Build(ctx context.Context) (res ComponentBuilderRe
return res, fmt.Errorf("configuring environment variables: %w", err)
}

sourceDockerSock, err := filepath.EvalSymlinks(dockerSocketPath)
if err != nil {
return res, fmt.Errorf("finding docker engine socket: %w", err)
var sourceDockerSock string
switch runtime.GOOS {
case "darwin":
// mac docker-for-desktop includes the raw socket in the VM
sourceDockerSock = "/var/run/docker.sock.raw"
default:
sourceDockerSock, err = filepath.EvalSymlinks(dockerSocketPath)
if err != nil {
return res, fmt.Errorf("finding docker engine socket: %w", err)
}
}

mounts := []mount.Mount{{
Expand Down