actions/runner
1
0
Fork 0
mirror of https://github.com/actions/runner.git synced 2025-12-12 15:13:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow the container.image to be empty (#2235)

Browse Source 
* Allow container.image to be null/empty

* Remove unnecessary workflow type

* Update src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateConverter.cs

Co-authored-by: Ferenc Hammerl <31069338+fhammerl@users.noreply.github.com>

* Rename ConvertToJobContainer to ConvertToContainer
It converts serviceContainers too

* Remove unused parameter
AllowExpressions was always false

* Allow service in yaml with empty string for value

* Don't attempt to start services without an image

* Improve error messages

* Revert "Remove unused parameter"

This reverts commit f4ab2d50d0.

* Revert "Rename ConvertToJobContainer to ConvertToContainer"

This reverts commit ffc62f8343.

* Fix revert merge conflict

* Removed info logs

* Added info log for services without container images

Co-authored-by: moonblade <moonblade168@gmail.com>
Co-authored-by: Ferenc Hammerl <31069338+fhammerl@users.noreply.github.com>
Co-authored-by: Ava Stancu <avastancu@github.com>
This commit is contained in:
JoannaaKL
2022-11-02 11:27:37 +01:00
committed by GitHub
parent dad7ad0384
commit 3e196355de
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Runner.Worker/JobExtension.cs
View File

@@ -220,6 +220,11 @@ namespace GitHub.Runner.Worker
{ {
var networkAlias = pair.Key; var networkAlias = pair.Key;
var serviceContainer = pair.Value; var serviceContainer = pair.Value;
if (serviceContainer == null)
{
context.Output($"The service '{networkAlias}' will not be started because the container definition has an empty image.");
continue;
}
jobContext.Global.ServiceContainers.Add(new Container.ContainerInfo(HostContext, serviceContainer, false, networkAlias)); jobContext.Global.ServiceContainers.Add(new Container.ContainerInfo(HostContext, serviceContainer, false, networkAlias));
} }
} }

2
src/Sdk/DTPipelines/Pipelines/ObjectTemplating/PipelineTemplateConverter.cs
View File

@@ -316,7 +316,7 @@ namespace GitHub.DistributedTask.Pipelines.ObjectTemplating
if (String.IsNullOrEmpty(result.Image)) if (String.IsNullOrEmpty(result.Image))
{ {
context.Error(value, "Container image cannot be empty"); return null;
} }
return result; return result;

4
src/Sdk/DTPipelines/workflow-v1.0.json
View File

@@ -381,7 +381,7 @@
"container-mapping": { "container-mapping": {
"mapping": { "mapping": {
"properties": { "properties": {
"image": "non-empty-string", "image": "string",
"options": "non-empty-string", "options": "non-empty-string",
"env": "container-env", "env": "container-env",
"ports": "sequence-of-non-empty-string", "ports": "sequence-of-non-empty-string",
@@ -414,7 +414,7 @@
"vars" "vars"
], ],
"one-of": [ "one-of": [
"non-empty-string", "string",
"container-mapping" "container-mapping"
] ]
}, },