Added interpolation to docker option in manifest.yaml #1100
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@huydoan2 It appears that one of the go libs. wskdeploy uses has updated its dependencies and now only works with go 1.13: |
added 5 commits
August 10, 2020 17:01
…h other packages. Modified unit tests to accomodate changes.
…isk-wskdeploy into action-interpolation
|
@huydoan2 It looks like the commit includes files from your other PR... it seems like you need to push from a rebased branch... |
mrutkows
requested changes
Aug 18, 2020
…into action-interpolation
mrutkows
approved these changes
Aug 18, 2020
| @@ -29,6 +29,8 @@ import ( | |||
|
|
|||
| "gopkg.in/yaml.v2" | |||
|
|
|||
| "net/url" | |||
There was a problem hiding this comment.
better ordering of dependencies
| @@ -796,7 +797,7 @@ func (dm *YAMLParser) composeActionExec(manifestFilePath string, manifestFileNam | |||
| if action.Native { | |||
| exec.Image = NATIVE_DOCKER_IMAGE | |||
| } else { | |||
| exec.Image = action.Docker | |||
| exec.Image = wskenv.InterpolateStringWithEnvVar(action.Docker).(string) | |||
There was a problem hiding this comment.
Interpolation feature in 1 line! Nice!
| @@ -960,8 +960,15 @@ func TestComposeActionsForDocker(t *testing.T) { | |||
| assert.NotNil(t, action.Action.Exec.Code, TEST_MSG_ACTION_CODE_MISSING) | |||
| assert.Equal(t, runtimes.BLACKBOX, action.Action.Exec.Kind, fmt.Sprintf(TEST_MSG_ACTION_DOCKER_KIND_MISMATCH, action.Action.Exec.Kind)) | |||
| assert.Equal(t, "mydockerhub/myimage", action.Action.Exec.Image, TEST_MSG_ACTION_DOCKER_IMAGE_MISMATCH) | |||
| case "CustomDockerAction6": | |||
There was a problem hiding this comment.
Thanks for adding a unit test
|
@huydoan2 Could you please update the docs to indicate this value can now be interpolated? Here is the file I was thinking of: |
mrutkows
approved these changes
Aug 21, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR adds environmental variable interpolation to docker action so that the image name can be provided through an environmental variable.
You now can do this: