Pass dockerfile to build executor #1606
Merged
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
This allows testing actions with non standard dockerfile names Signed-off-by: Aidan Jensen <aidan@artificial.com>
artificial-aidan
commented
Feb 3, 2023
pkg/container/docker_build.go
Outdated
| @@ -50,7 +50,8 @@ func NewDockerBuildExecutor(input NewDockerBuildExecutorInput) common.Executor { | |||
| if input.Container != nil { | |||
| buildContext, err = input.Container.GetContainerArchive(ctx, input.ContextDir+"/.") | |||
| } else { | |||
| buildContext, err = createBuildContext(ctx, input.ContextDir, "Dockerfile") | |||
| buildContext, err = createBuildContext(ctx, input.ContextDir, input.Dockerfile) | |||
| options.Dockerfile = input.Dockerfile | |||
There was a problem hiding this comment.
I only set it here because I wasn't sure what the expectation was when the input.Container was not nil. It would seem cleaner to set it in the above block, but I was worried about changing existing behavior.
There was a problem hiding this comment.
input.Container = local action, build context not present outside of the docker container.
Please move it out of the if condition.
Assumes the dockerfile is read from the buildcontext.
artificial-aidan
commented
Feb 3, 2023
| @@ -11,3 +11,5 @@ jobs: | |||
| - uses: './actions-environment-and-context-tests/docker' | |||
| - uses: 'nektos/act-test-actions/js@main' | |||
| - uses: 'nektos/act-test-actions/docker@main' | |||
| - uses: 'artificial-aidan/act-test-actions/docker-file@6e10d41bbdb0919d19847350a7763a580cfa41c8' | |||
| - uses: 'artificial-aidan/act-test-actions/docker-relative-context/action@6e10d41bbdb0919d19847350a7763a580cfa41c8' | |||
There was a problem hiding this comment.
This action tests my previous PR
Codecov Report
@@ Coverage Diff @@
## master #1606 +/- ##
==========================================
+ Coverage 61.22% 61.87% +0.65%
==========================================
Files 46 46
Lines 7141 7248 +107
==========================================
+ Hits 4372 4485 +113
+ Misses 2462 2459 -3
+ Partials 307 304 -3
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
Signed-off-by: Aidan Jensen <aidan@artificial.com>
ChristopherHX
approved these changes
Feb 3, 2023
KnisterPeter
approved these changes
Feb 7, 2023
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 allows testing actions with non standard dockerfile names
This PR is required for the tests I added. The tests also cover my previous relative dockerfile PR changes. Once that PR is in I can update the test workflows to use the normal test repo.
Signed-off-by: Aidan Jensen aidan@artificial.com
Commit Message
{{title}} (#1606)
This allows testing actions with non standard dockerfile names
Signed-off-by: Aidan Jensen aidan@artificial.com