From a101c944b6208453843f1f54666a7242a367d0d0 Mon Sep 17 00:00:00 2001 From: Nick Carboni Date: Tue, 2 Oct 2018 14:13:31 -0400 Subject: [PATCH] Don't start memcached in any container runtime This was originally fixed in 3d3f716481d but was then broken again in 0735aecc184 This will allow the monolithic container image to run properly --- lib/miq_environment.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/miq_environment.rb b/lib/miq_environment.rb index 4b72359575e..ac3552188b6 100644 --- a/lib/miq_environment.rb +++ b/lib/miq_environment.rb @@ -6,7 +6,7 @@ class Command def self.supports_memcached? return @supports_memcached unless @supports_memcached.nil? - @supports_memcached = is_linux? && is_appliance? && !is_podified? && supports_command?('memcached') && supports_command?('memcached-tool') && supports_command?('service') + @supports_memcached = is_linux? && is_appliance? && !is_container? && supports_command?('memcached') && supports_command?('memcached-tool') && supports_command?('service') end def self.supports_apache?