Skip to content

Commit d8088b5

Browse files
committed
Merge branch 'main' into remote-camera-validation-rule
2 parents 57e2217 + 5b1dbf2 commit d8088b5

File tree

3 files changed

+3
-17
lines changed

3 files changed

+3
-17
lines changed

internal/orchestrator/app/generator/app_template/sketch/sketch.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,4 @@ profiles:
33
platforms:
44
- platform: arduino:zephyr
55
libraries:
6-
- MsgPack (0.4.2)
7-
- DebugLog (0.8.4)
8-
- ArxContainer (0.7.0)
9-
- ArxTypeTraits (0.3.1)
106
default_profile: default

internal/orchestrator/app/generator/testdata/app-all.golden/sketch/sketch.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,4 @@ profiles:
33
platforms:
44
- platform: arduino:zephyr
55
libraries:
6-
- MsgPack (0.4.2)
7-
- DebugLog (0.8.4)
8-
- ArxContainer (0.7.0)
9-
- ArxTypeTraits (0.3.1)
106
default_profile: default

internal/orchestrator/orchestrator.go

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -899,15 +899,9 @@ func CloneApp(
899899

900900
func DeleteApp(ctx context.Context, dockerClient command.Cli, app app.ArduinoApp) error {
901901

902-
runningApp, err := getRunningApp(ctx, dockerClient.Client())
903-
if err != nil {
904-
return err
905-
}
906-
if runningApp != nil && runningApp.FullPath.EqualsTo(app.FullPath) {
907-
// We try to remove docker related resources at best effort
908-
for range StopAndDestroyApp(ctx, dockerClient, app) {
909-
// just consume the iterator
910-
}
902+
// We try to remove docker related resources at best effort
903+
for range StopAndDestroyApp(ctx, dockerClient, app) {
904+
// just consume the iterator
911905
}
912906

913907
return app.FullPath.RemoveAll()

0 commit comments

Comments
 (0)