From 432fc2f4155ad0f481c67c39ae89e3837b6441e0 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Thu, 7 Mar 2019 12:22:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=84=E6=B5=8B=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=BB=E7=B1=BB=E5=88=AB=E5=92=8C=E5=B0=8F=E7=B1=BB=E5=88=AB?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/application_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e6645b3f..b4b156a0 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -240,7 +240,7 @@ module ApplicationHelper
     container = []
     mirror_repositories.each do |mr|
       if mr.name.present?
-        container << {:image => mr.name, :cpuLimit => mr.cpu_limit, :memoryLimit =>  "#{mr.memory_limit}M"}
+        container << {:image => mr.name, :cpuLimit => mr.cpu_limit, :memoryLimit =>  "#{mr.memory_limit}M", :type => mr.try(:main_type) == "1" ? "main" : "sub"}
       end
     end
     return container.to_json

From 92e150105770232fe1a39014a10caca0a5e9d9e3 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Thu, 7 Mar 2019 17:41:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9A=82=E5=81=9C=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=94=B9=E4=B8=BA3=E6=9C=888=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/update.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/update.html b/public/update.html
index b2667a27..a6bf6ab6 100644
--- a/public/update.html
+++ b/public/update.html
@@ -56,7 +56,7 @@ If you continue to experience problems please contact your Trustie administrator
             温馨提示:为了给大家提供更优质的服务
         </p>
         <p class="font-18">
-            平台拟于<span style="color: red">2019年3月7日00:00--8:00</span>进行全面升级，带来不便，敬请谅解！
+            平台拟于<span style="color: red">2019年3月8日00:00--8:00</span>进行全面升级，带来不便，敬请谅解！
         </p>
     </div>
 </div>