浏览代码

Merge pull request #753 from docker/secrets-remove-inline

Remove inline secrets option
Guillaume Tardif 5 年之前
父节点
当前提交
a6ef06f131
共有 1 个文件被更改,包括 3 次插入10 次删除
  1. 3 10
      aci/convert/convert.go

+ 3 - 10
aci/convert/convert.go

@@ -49,7 +49,6 @@ const (
 	volumeDriveroptsShareNameKey   = "share_name"
 	volumeDriveroptsShareNameKey   = "share_name"
 	volumeDriveroptsAccountNameKey = "storage_account_name"
 	volumeDriveroptsAccountNameKey = "storage_account_name"
 	volumeReadOnly                 = "read_only"
 	volumeReadOnly                 = "read_only"
-	secretInlineMark               = "inline:"
 )
 )
 
 
 // ToContainerGroup converts a compose project into a ACI container group
 // ToContainerGroup converts a compose project into a ACI container group
@@ -190,15 +189,9 @@ type projectAciHelper types.Project
 func (p projectAciHelper) getAciSecretVolumes() ([]containerinstance.Volume, error) {
 func (p projectAciHelper) getAciSecretVolumes() ([]containerinstance.Volume, error) {
 	var secretVolumes []containerinstance.Volume
 	var secretVolumes []containerinstance.Volume
 	for secretName, filepathToRead := range p.Secrets {
 	for secretName, filepathToRead := range p.Secrets {
-		var data []byte
-		if strings.HasPrefix(filepathToRead.File, secretInlineMark) {
-			data = []byte(filepathToRead.File[len(secretInlineMark):])
-		} else {
-			var err error
-			data, err = ioutil.ReadFile(filepathToRead.File)
-			if err != nil {
-				return secretVolumes, err
-			}
+		data, err := ioutil.ReadFile(filepathToRead.File)
+		if err != nil {
+			return secretVolumes, err
 		}
 		}
 		if len(data) == 0 {
 		if len(data) == 0 {
 			continue
 			continue