Skip to content

Support FROM “scratch”#3379

Merged
nkubala merged 1 commit intoGoogleContainerTools:masterfrom
dgageot:fix-3364
Dec 13, 2019
Merged

Support FROM “scratch”#3379
nkubala merged 1 commit intoGoogleContainerTools:masterfrom
dgageot:fix-3364

Conversation

@dgageot
Copy link
Copy Markdown
Contributor

@dgageot dgageot commented Dec 13, 2019

Fix #3364

@codecov
Copy link
Copy Markdown

codecov bot commented Dec 13, 2019

Codecov Report

Merging #3379 into master will increase coverage by 0.01%.
The diff coverage is 100%.

Impacted Files Coverage Δ
pkg/skaffold/docker/parse.go 87.7% <100%> (+0.4%) ⬆️

testutil.CheckDeepEqual(t, `scratch`, unquote(`""scratch""`))
testutil.CheckDeepEqual(t, `scratch`, unquote(`'scratch'`))
testutil.CheckDeepEqual(t, `scratch`, unquote(`''scratch''`))
testutil.CheckDeepEqual(t, `'scratch'`, unquote(`"'scratch'"`))
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this seems a little inconsistent, can this strip the single quotes too?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not what docker does. I know... I tried to support every case that docker supports, no more

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ugh, ok. not great but that's the right thing to do

@nkubala nkubala merged commit fbb84e8 into GoogleContainerTools:master Dec 13, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Error parsing Dockerfile FROM "scratch" where scratch is quoted

3 participants