Merge pull request #1717 from tonistiigi/run-mount-stable

dockerfile: update run mounts to stable channel
moby · Oct 5, 2020 · 0e916c2 · 0e916c2
2 parents 19c4cba + 906e345
commit 0e916c2
Show file tree

Hide file tree

Showing 21 changed files with 6 additions and 83 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -6,8 +6,8 @@ run:
  modules-download-mode: vendor
 
  build-tags:
- - dfrunmount
- - dfssh
+ - dfrunsecurity
+ - dfrunnetwork
 
 linters:
  enable:
@@ -29,4 +29,4 @@ issues:
  exclude-rules:
  - linters:
  - golint
- text: "stutters"
+ text: "stutters"
diff --git a/frontend/dockerfile/cmd/dockerfile-frontend/hack/release b/frontend/dockerfile/cmd/dockerfile-frontend/hack/release
@@ -108,7 +108,7 @@ case $TYP in
  ;;
 "daily")
  if [ -z $DAILY_TARGETS ]; then
- DAILY_TARGETS="mounts secrets ssh"
+ # DAILY_TARGETS=""
  fi
 
  for TAG in $DAILY_TARGETS; do

diff --git a/frontend/dockerfile/dockerfile2llb/convert_norunmount.go b/frontend/dockerfile/dockerfile2llb/convert_norunmount.go
diff --git a/frontend/dockerfile/dockerfile2llb/convert_nosecrets.go b/frontend/dockerfile/dockerfile2llb/convert_nosecrets.go
diff --git a/frontend/dockerfile/dockerfile2llb/convert_nossh.go b/frontend/dockerfile/dockerfile2llb/convert_nossh.go
diff --git a/frontend/dockerfile/dockerfile2llb/convert_runmount.go b/frontend/dockerfile/dockerfile2llb/convert_runmount.go
@@ -1,5 +1,3 @@
-// +build dfrunmount
-
 package dockerfile2llb
 
 import (

diff --git a/frontend/dockerfile/dockerfile2llb/convert_secrets.go b/frontend/dockerfile/dockerfile2llb/convert_secrets.go
@@ -1,5 +1,3 @@
-// +build dfsecrets
-
 package dockerfile2llb
 
 import (

diff --git a/frontend/dockerfile/dockerfile2llb/convert_ssh.go b/frontend/dockerfile/dockerfile2llb/convert_ssh.go
@@ -1,5 +1,3 @@
-// +build dfssh
-
 package dockerfile2llb
 
 import (

diff --git a/frontend/dockerfile/dockerfile_mount_test.go b/frontend/dockerfile/dockerfile_mount_test.go
@@ -1,5 +1,3 @@
-// +build dfrunmount
-
 package dockerfile
 
 import (

diff --git a/frontend/dockerfile/dockerfile_secrets_test.go b/frontend/dockerfile/dockerfile_secrets_test.go
@@ -1,5 +1,3 @@
-// +build dfsecrets
-
 package dockerfile
 
 import (

diff --git a/frontend/dockerfile/dockerfile_ssh_test.go b/frontend/dockerfile/dockerfile_ssh_test.go
@@ -1,5 +1,3 @@
-// +build dfssh
-
 package dockerfile
 
 import (

diff --git a/frontend/dockerfile/instructions/commands_nosecrets.go b/frontend/dockerfile/instructions/commands_nosecrets.go
diff --git a/frontend/dockerfile/instructions/commands_nossh.go b/frontend/dockerfile/instructions/commands_nossh.go
diff --git a/frontend/dockerfile/instructions/commands_runmount.go b/frontend/dockerfile/instructions/commands_runmount.go
@@ -1,5 +1,3 @@
-// +build dfrunmount
-
 package instructions
 
 import (

diff --git a/frontend/dockerfile/instructions/commands_secrets.go b/frontend/dockerfile/instructions/commands_secrets.go
@@ -1,5 +1,3 @@
-// +build dfsecrets
-
 package instructions
 
 func isSecretMountsSupported() bool {

diff --git a/frontend/dockerfile/instructions/commands_ssh.go b/frontend/dockerfile/instructions/commands_ssh.go
@@ -1,5 +1,3 @@
-// +build dfssh
-
 package instructions
 
 func isSSHMountsSupported() bool {

diff --git a/frontend/dockerfile/release/experimental/tags b/frontend/dockerfile/release/experimental/tags
@@ -1 +1 @@
-dfrunmount dfrunsecurity dfsecrets dfssh dfrunnetwork
+dfrunsecurity dfrunnetwork
diff --git a/frontend/dockerfile/release/mounts/tags b/frontend/dockerfile/release/mounts/tags
diff --git a/frontend/dockerfile/release/secrets/tags b/frontend/dockerfile/release/secrets/tags
diff --git a/frontend/dockerfile/release/ssh/tags b/frontend/dockerfile/release/ssh/tags
diff --git a/hack/test b/hack/test
@@ -90,7 +90,7 @@ fi
 DOCKERFILE_RELEASES_CUSTOM=""
 if [ "$TEST_DOCKERFILE" == 1 ]; then
  if [ -z $DOCKERFILE_RELEASES ]; then
- DOCKERFILE_RELEASES="mainline experimental mounts secrets ssh"
+ DOCKERFILE_RELEASES="mainline experimental"
  else
  DOCKERFILE_RELEASES_CUSTOM=1
  fi