Skip to content

Commit 4d1e6cf

Browse files
authored
fix: Fix to be able to run finch build with --ssh option (runfinch#696)
In the current implementation, the following error occurs when running finch build with the `--ssh default` option. This issue is also reported in issue/452. ``` error: invalid empty ssh agent socket: make sure SSH_AUTH_SOCK is set FATA[0000] no image was built FATA[0000] exit status 1 ``` This is because the ssh agent is not starting on the vm started using lima and the SSH_AUTH_SOCK variable is empty. As a result, this error occurs. On the other hand, setting forwardAgent to true in finch.yaml will configure the vm to forward the ssh agent. As a result, the ssh agent will be started in the vm and finch build can be executed using the `--ssh default` option. Therefore, this commit will fix it so that finch build can be run using the `--ssh default` option. Issue #, if available: runfinch#452 *Description of changes:* Details are described in commit messages. *Testing done:* Yes, confirmation of the operation is added in the comments of the issue below. - runfinch#452 (comment) - [x] I've reviewed the guidance in CONTRIBUTING.md #### License Acceptance By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license. --------- Signed-off-by: Hayato Kiwata <[email protected]>
1 parent e064d94 commit 4d1e6cf

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

Diff for: finch.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ ssh:
105105
loadDotSSHPubKeys: false
106106
# Forward ssh agent into the instance.
107107
# 🟢 Builtin default: false
108-
forwardAgent: null
108+
forwardAgent: true
109109
# Forward X11 into the instance
110110
# 🟢 Builtin default: false
111111
forwardX11: null

Diff for: go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ require (
99
github.com/golang/mock v1.6.0
1010
github.com/google/go-licenses v1.6.0
1111
github.com/lima-vm/lima v0.18.0
12-
github.com/onsi/ginkgo/v2 v2.13.0
12+
github.com/onsi/ginkgo/v2 v2.13.1
1313
github.com/onsi/gomega v1.30.0
1414
github.com/pelletier/go-toml v1.9.5
1515
github.com/pkg/sftp v1.13.6
16-
github.com/runfinch/common-tests v0.7.8
16+
github.com/runfinch/common-tests v0.7.9
1717
github.com/shirou/gopsutil/v3 v3.23.10
1818
github.com/sirupsen/logrus v1.9.3
1919
github.com/spf13/afero v1.10.0
@@ -60,7 +60,7 @@ require (
6060
github.com/docker/go-units v0.5.0
6161
github.com/emirpasic/gods v1.12.0 // indirect
6262
github.com/fatih/color v1.15.0 // indirect
63-
github.com/go-logr/logr v1.2.4 // indirect
63+
github.com/go-logr/logr v1.3.0 // indirect
6464
github.com/goccy/go-yaml v1.11.2 // indirect
6565
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6666
github.com/google/go-cmp v0.6.0 // indirect

Diff for: go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,8 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9
133133
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
134134
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
135135
github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
136-
github.com/go-logr/logr v1.2.4 h1:g01GSCwiDw2xSZfjJ2/T9M+S6pFdcNtFYsp+Y43HYDQ=
137-
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
136+
github.com/go-logr/logr v1.3.0 h1:2y3SDp0ZXuc6/cjLSZ+Q3ir+QB9T/iG5yYRXqsagWSY=
137+
github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
138138
github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
139139
github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
140140
github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
@@ -291,8 +291,8 @@ github.com/mdlayher/vsock v1.2.1/go.mod h1:NRfCibel++DgeMD8z/hP+PPTjlNJsdPOmxcnE
291291
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
292292
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
293293
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
294-
github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4=
295-
github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o=
294+
github.com/onsi/ginkgo/v2 v2.13.1 h1:LNGfMbR2OVGBfXjvRZIZ2YCTQdGKtPLvuI1rMCCj3OU=
295+
github.com/onsi/ginkgo/v2 v2.13.1/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM=
296296
github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
297297
github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
298298
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
@@ -325,8 +325,8 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
325325
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
326326
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
327327
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
328-
github.com/runfinch/common-tests v0.7.8 h1:uXskg7qUSLp+2H+BT3rsAn5RZ90XVTn8LYOOj6ODsUg=
329-
github.com/runfinch/common-tests v0.7.8/go.mod h1:SiFfCOWo+b2SpA/MwEa3z3cFTCyuEJQJXBJ6ItH6G64=
328+
github.com/runfinch/common-tests v0.7.9 h1:BcaiHZ/e8VTpaXKb3usP3vwddxVmsfpIELHM5peFJcg=
329+
github.com/runfinch/common-tests v0.7.9/go.mod h1:iztvjCXgz5DmmRw1SAVWqcyVgER4932X1Q4W1EgY9QU=
330330
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
331331
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
332332
github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=

0 commit comments

Comments
 (0)