fergalmoran/Readarr
1
0
Fork 0
mirror of https://github.com/fergalmoran/Readarr.git synced 2026-01-06 08:46:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: Don't throw error on Docker Update Attempt (#725)

Browse Source
This commit is contained in:
Qstick
2019-04-06 17:06:23 -04:00
committed by GitHub
parent ec780c310c
commit d81b063388
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/NzbDrone.Core.Test/UpdateTests/UpdateServiceFixture.cs
View File

@@ -91,10 +91,11 @@ namespace NzbDrone.Core.Test.UpdateTests
public void should_not_update_if_inside_docker()
{
Mocker.GetMock<IOsInfo>().Setup(x => x.IsDocker).Returns(true);
Subject.Invoking(x => x.Execute(new ApplicationUpdateCommand()))
.ShouldThrow<CommandFailedException>()
.WithMessage("Updating is disabled inside a docker container. Please update the container image.");
Subject.Execute(new ApplicationUpdateCommand());
Mocker.GetMock<IProcessProvider>()
.Verify(c => c.Start(It.IsAny<string>(), It.Is<string>(s => s.StartsWith("12")), null, null, null), Times.Never());
}
[Test]

3
src/NzbDrone.Core/Update/InstallUpdateService.cs
View File

@@ -209,7 +209,8 @@ namespace NzbDrone.Core.Update
if (_osInfo.IsDocker)
{
throw new CommandFailedException("Updating is disabled inside a docker container. Please update the container image.");
_logger.ProgressDebug("Updating is disabled inside a docker container. Please update the container image.");
return;
}
if (OsInfo.IsNotWindows && !_configFileProvider.UpdateAutomatically && message.Trigger != CommandTrigger.Manual)