@@ -180,7 +180,7 @@ func regexpMatch(pattern, path string) (bool, error) {

 		} else if ch == '?' {

 			// "?" is any char except "/"

 			regStr += "[^" + escSL + "]"

-		} else if strings.Index(".$", string(ch)) != -1 {

+		} else if ch == '.' || ch == '$' {

 			// Escape some regexp special chars that have no meaning

 			// in golang's filepath.Match

 			regStr += `\` + string(ch)

@@ -697,7 +697,7 @@ func parseSecurityOpts(securityOpts []string) ([]string, error) {

 	for key, opt := range securityOpts {

 		con := strings.SplitN(opt, "=", 2)

 		if len(con) == 1 && con[0] != "no-new-privileges" {

-			if strings.Index(opt, ":") != -1 {

+			if strings.Contains(opt, ":") {

 				con = strings.SplitN(opt, ":", 2)

 			} else {

 				return securityOpts, fmt.Errorf("Invalid --security-opt: %q", opt)