toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33826 from Microsoft/jjh/lcownits

Browse Source 
LCOW: Fix nits from 33241
Upstream-commit: 950d472c9ce4180b80e28030f7de68ffc3254f97
Component: engine
This commit is contained in:
John Howard
2017-06-27 22:56:38 -07:00
committed by GitHub
parent 674cb1c136 9a5747b3f9
commit 08b4e324e5
18 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/builder/dockerfile/evaluator.go
+1 -1
View File
@@ -233,7 +233,7 @@ func (s *dispatchState) beginStage(stageName string, image builder.Image) {
func (s *dispatchState) setDefaultPath() {
// TODO @jhowardmsft LCOW Support - This will need revisiting later
platform := runtime.GOOS
if platform == "windows" && system.LCOWSupported() {
if system.LCOWSupported() {
platform = "linux"
}
if system.DefaultPathEnv(platform) == "" {
components/engine/builder/dockerfile/parser/parser.go
+5 -5
View File
@@ -91,8 +91,8 @@ var (
// DefaultEscapeToken is the default escape token
const DefaultEscapeToken = '\\'
// DefaultPlatformToken is the platform assumed for the build if not explicitly provided
var DefaultPlatformToken = runtime.GOOS
// defaultPlatformToken is the platform assumed for the build if not explicitly provided
var defaultPlatformToken = runtime.GOOS
// Directive is the structure used during a build run to hold the state of
// parsing directives.
@@ -119,7 +119,7 @@ func (d *Directive) setEscapeToken(s string) error {
func (d *Directive) setPlatformToken(s string) error {
s = strings.ToLower(s)
valid := []string{runtime.GOOS}
if runtime.GOOS == "windows" && system.LCOWSupported() {
if system.LCOWSupported() {
valid = append(valid, "linux")
}
for _, item := range valid {
@@ -154,7 +154,7 @@ func (d *Directive) possibleParserDirective(line string) error {
// TODO @jhowardmsft LCOW Support: Eventually this check can be removed,
// but only recognise a platform token if running in LCOW mode.
if runtime.GOOS == "windows" && system.LCOWSupported() {
if system.LCOWSupported() {
tpcMatch := tokenPlatformCommand.FindStringSubmatch(strings.ToLower(line))
if len(tpcMatch) != 0 {
for i, n := range tokenPlatformCommand.SubexpNames() {
@@ -177,7 +177,7 @@ func (d *Directive) possibleParserDirective(line string) error {
func NewDefaultDirective() *Directive {
directive := Directive{}
directive.setEscapeToken(string(DefaultEscapeToken))
directive.setPlatformToken(runtime.GOOS)
directive.setPlatformToken(defaultPlatformToken)
return &directive
}