Skip to content

Commit 11a2c6a

Browse files
committed
dockerfile: graduate ADD --checksum=<checksum> from labs
e.g., ``` ADD --checksum=sha256:24454f830cdb571e2c4ad15481119c43b3cafd48dd869a9b2945d1036d1dc68d \ https://mirrors.edge.kernel.org/pub/linux/kernel/Historic/linux-0.01.tar.gz / ``` Introduced to dockerfile:1.5-labs in PR 3093 Signed-off-by: Akihiro Suda <[email protected]>
1 parent cc107f5 commit 11a2c6a

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-
- dfaddchecksum
1110

1211
linters:
1312
enable:

frontend/dockerfile/dockerfile2llb/convert.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,9 +1055,6 @@ func dispatchCopy(d *dispatchState, cfg copyConfig) error {
10551055
if !cfg.isAddCommand {
10561056
return errors.New("checksum can't be specified for COPY")
10571057
}
1058-
if !addChecksumEnabled {
1059-
return errors.New("instruction 'ADD --checksum=<CHECKSUM>' requires the labs channel")
1060-
}
10611058
if len(cfg.params.SourcePaths) != 1 {
10621059
return errors.New("checksum can't be specified for multiple sources")
10631060
}

frontend/dockerfile/dockerfile2llb/convert_addchecksum.go

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

frontend/dockerfile/dockerfile2llb/convert_noaddchecksum.go

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

frontend/dockerfile/dockerfile_addchecksum_test.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
//go:build dfaddchecksum
2-
// +build dfaddchecksum
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
@@ -1298,6 +1298,7 @@ guide – Leverage build cache](https://docs.docker.com/develop/develop-images/d
12981298
> **Note**
12991299
>
13001300
> Not yet available in stable syntax, use [`docker/dockerfile:1-labs`](#syntax) version (`1.5-labs` or newer).
1301+
> Planned to be included in `docker/dockerfile:1.6`.
13011302
13021303
The checksum of a remote file can be verified with the `--checksum` flag:
13031304

frontend/dockerfile/release/labs/tags

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

0 commit comments

Comments
 (0)