From 698d3a2e66a6bdc3d4b0a773122a236e8a7964dc Mon Sep 17 00:00:00 2001
From: George Karagoulis <karagog@gmail.com>
Date: Mon, 20 Dec 2021 07:55:47 -0800
Subject: [PATCH] Show service container logs on teardown (#1563)

* Update ContainerOperationProvider.cs

* Only print logs for service container jobs.
---
 src/Runner.Worker/ContainerOperationProvider.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/Runner.Worker/ContainerOperationProvider.cs b/src/Runner.Worker/ContainerOperationProvider.cs
index b3f10c115..62ef1df47 100644
--- a/src/Runner.Worker/ContainerOperationProvider.cs
+++ b/src/Runner.Worker/ContainerOperationProvider.cs
@@ -338,6 +338,18 @@ namespace GitHub.Runner.Worker
 
             if (!string.IsNullOrEmpty(container.ContainerId))
             {
+                if(!container.IsJobContainer)
+                {
+                    // Print logs for service container jobs (not the "action" job itself b/c that's already logged).
+                    executionContext.Output($"Print service container logs: {container.ContainerDisplayName}");
+                    
+                    int logsExitCode = await _dockerManager.DockerLogs(executionContext, container.ContainerId);
+                    if (logsExitCode != 0)
+                    {
+                        executionContext.Warning($"Docker logs fail with exit code {logsExitCode}");
+                    }
+                }
+
                 executionContext.Output($"Stop and remove container: {container.ContainerDisplayName}");
 
                 int rmExitCode = await _dockerManager.DockerRemove(executionContext, container.ContainerId);