Skip to content

Commit fcffbe6

Browse files
csweichelroboquat
authored andcommitted
[docker-up] Fix dev-time errors
1 parent 37908b4 commit fcffbe6

File tree

6 files changed

+8
-3
lines changed

6 files changed

+8
-3
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ repos:
2121
exclude: |
2222
(?x)^(
2323
.*example-layer.tar.gz|
24+
.*docker.tgz|
2425
.*\.(png|svg|ico|gpg)|
2526
dev/version-manifest/version-manifest|
2627
.*gradle-wrapper\.jar

components/docker-up/BUILD.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ packages:
1313
- GOOS=linux
1414
prep:
1515
- ["mv", "docker-up/main.go", "."]
16-
- ["rmdir", "docker-up"]
16+
- ["rm", "-r", "docker-up"]
1717
- ["go", "generate"]
1818
config:
1919
dontTest: true
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
This file is downloaded as part of the build.
2+
It's part of the repo to avoid errors at development time.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
This file is downloaded as part of the build.
2+
It's part of the repo to avoid errors at development time.

components/docker-up/docker-up/main.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -377,8 +377,6 @@ func installDocker() error {
377377
//nolint:errcheck
378378
os.Chtimes(dstpath, hdr.AccessTime, hdr.ModTime)
379379
}
380-
381-
return nil
382380
}
383381

384382
func installDockerCompose() error {

components/docker-up/docker-up/runc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
This file is downloaded as part of the build.
2+
It's part of the repo to avoid errors at development time.

0 commit comments

Comments
 (0)