dockerfile: update run mounts to stable channel

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-10-04 20:30:50 -07:00 · 2020-10-04 20:30:50 -07:00 · 906e34510d
parent 78f3e86dc1
commit 906e34510d
21 changed files with 6 additions and 83 deletions
--- 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"
--- 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
--- a/frontend/dockerfile/dockerfile2llb/convert_norunmount.go
+++ b/frontend/dockerfile/dockerfile2llb/convert_norunmount.go
@ -1,16 +0,0 @@
-// +build !dfrunmount
-
-package dockerfile2llb
-
-import (
-	"github.com/moby/buildkit/client/llb"
-	"github.com/moby/buildkit/frontend/dockerfile/instructions"
-)
-
-func detectRunMount(cmd *command, allDispatchStates *dispatchStates) bool {
-	return false
-}
-
-func dispatchRunMounts(d *dispatchState, c *instructions.RunCommand, sources []*dispatchState, opt dispatchOpt) ([]llb.RunOption, error) {
-	return nil, nil
-}
--- a/frontend/dockerfile/dockerfile2llb/convert_nosecrets.go
+++ b/frontend/dockerfile/dockerfile2llb/convert_nosecrets.go
@ -1,13 +0,0 @@
-// +build dfrunmount,!dfsecrets
-
-package dockerfile2llb
-
-import (
-	"github.com/moby/buildkit/client/llb"
-	"github.com/moby/buildkit/frontend/dockerfile/instructions"
-	"github.com/pkg/errors"
-)
-
-func dispatchSecret(m *instructions.Mount) (llb.RunOption, error) {
-	return nil, errors.Errorf("secret mounts not allowed")
-}
--- a/frontend/dockerfile/dockerfile2llb/convert_nossh.go
+++ b/frontend/dockerfile/dockerfile2llb/convert_nossh.go
@ -1,13 +0,0 @@
-// +build dfrunmount,!dfssh
-
-package dockerfile2llb
-
-import (
-	"github.com/moby/buildkit/client/llb"
-	"github.com/moby/buildkit/frontend/dockerfile/instructions"
-	"github.com/pkg/errors"
-)
-
-func dispatchSSH(m *instructions.Mount) (llb.RunOption, error) {
-	return nil, errors.Errorf("ssh mounts not allowed")
-}
--- a/frontend/dockerfile/dockerfile2llb/convert_runmount.go
+++ b/frontend/dockerfile/dockerfile2llb/convert_runmount.go
@ -1,5 +1,3 @@
-// +build dfrunmount
-
 package dockerfile2llb

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

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

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

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

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

 import (
--- a/frontend/dockerfile/instructions/commands_nosecrets.go
+++ b/frontend/dockerfile/instructions/commands_nosecrets.go
@ -1,7 +0,0 @@
-// +build !dfsecrets
-
-package instructions
-
-func isSecretMountsSupported() bool {
-	return false
-}
--- a/frontend/dockerfile/instructions/commands_nossh.go
+++ b/frontend/dockerfile/instructions/commands_nossh.go
@ -1,7 +0,0 @@
-// +build !dfssh
-
-package instructions
-
-func isSSHMountsSupported() bool {
-	return false
-}
--- a/frontend/dockerfile/instructions/commands_runmount.go
+++ b/frontend/dockerfile/instructions/commands_runmount.go
@ -1,5 +1,3 @@
-// +build dfrunmount
-
 package instructions

 import (
--- 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 {
--- 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 {
--- a/frontend/dockerfile/release/experimental/tags
+++ b/frontend/dockerfile/release/experimental/tags
@ -1 +1 @@
-dfrunmount dfrunsecurity dfsecrets dfssh dfrunnetwork
+dfrunsecurity dfrunnetwork
--- a/frontend/dockerfile/release/mounts/tags
+++ b/frontend/dockerfile/release/mounts/tags
@ -1 +0,0 @@
-dfrunmount
--- a/frontend/dockerfile/release/secrets/tags
+++ b/frontend/dockerfile/release/secrets/tags
@ -1 +0,0 @@
-dfrunmount dfsecrets
--- a/frontend/dockerfile/release/ssh/tags
+++ b/frontend/dockerfile/release/ssh/tags
@ -1 +0,0 @@
-dfrunmount dfssh
--- 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