Skip to content

Commit cc107f5

Browse files
committed
dockerfile: graduate ADD <git ref> from labs
e.g., `ADD https://github.com/moby/buildkit.git#v0.10.1 /buildkit` Introduced to dockerfile:1.5-labs in PR 2799 Signed-off-by: Akihiro Suda <[email protected]>
1 parent 5b9a9ce commit cc107f5

File tree

7 files changed

+2
-20
lines changed

7 files changed

+2
-20
lines changed

.golangci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ run:
77

88
build-tags:
99
- dfrunsecurity
10-
- dfaddgit
1110
- dfaddchecksum
1211

1312
linters:

frontend/dockerfile/dockerfile2llb/convert.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,9 +1082,6 @@ func dispatchCopy(d *dispatchState, cfg copyConfig) error {
10821082
if !cfg.isAddCommand {
10831083
return errors.New("source can't be a git ref for COPY")
10841084
}
1085-
if !addGitEnabled {
1086-
return errors.New("instruction ADD <git ref> requires the labs channel")
1087-
}
10881085
// TODO: print a warning (not an error) if gitRef.UnencryptedTCP is true
10891086
commit := gitRef.Commit
10901087
if gitRef.SubDir != "" {

frontend/dockerfile/dockerfile2llb/convert_addgit.go

Lines changed: 0 additions & 6 deletions
This file was deleted.

frontend/dockerfile/dockerfile2llb/convert_noaddgit.go

Lines changed: 0 additions & 6 deletions
This file was deleted.

frontend/dockerfile/dockerfile_addgit_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
//go:build dfaddgit
2-
// +build dfaddgit
3-
41
package dockerfile
52

63
import (

frontend/dockerfile/docs/reference.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1312,6 +1312,7 @@ The `--checksum` flag only supports HTTP sources currently.
13121312
> **Note**
13131313
>
13141314
> Not yet available in stable syntax, use [`docker/dockerfile:1-labs`](#syntax) version (`1.5-labs` or newer).
1315+
> Planned to be included in `docker/dockerfile:1.6`.
13151316
13161317
This form allows adding a git repository to an image directly, without using the `git` command inside the image:
13171318
```

frontend/dockerfile/release/labs/tags

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
dfrunsecurity dfaddgit dfaddchecksum
1+
dfrunsecurity dfaddchecksum

0 commit comments

Comments
 (0)