From fbf3a8ce67dae79a4b7e91f451f9c02e1bf5c001 Mon Sep 17 00:00:00 2001
From: MaxKey <shimingxy@qq.com>
Date: Sat, 14 Nov 2020 20:38:06 +0800
Subject: [PATCH] docker

---
 maxkey-web-manage/build.gradle | 14 +++++++++-----
 maxkey-web-maxkey/build.gradle | 14 +++++++++-----
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/maxkey-web-manage/build.gradle b/maxkey-web-manage/build.gradle
index 01b4321b9..c6e9da1ac 100644
--- a/maxkey-web-manage/build.gradle
+++ b/maxkey-web-manage/build.gradle
@@ -6,10 +6,7 @@ buildscript {
 	}
 }
 
-plugins {
-	id 'com.google.cloud.tools.jib' version '2.6.0'
-	id 'org.springframework.boot' version '2.3.4.RELEASE'
-}
+
 
 description = "maxkey-web-manage"
 
@@ -20,12 +17,18 @@ apply plugin: 'java'
 //apply plugin: 'com.bmuschko.tomcat-base'
 //apply plugin: 'com.bmuschko.tomcat'
 
+/*
+plugins {
+	id 'com.google.cloud.tools.jib' version '2.6.0'
+	id 'org.springframework.boot' version '2.3.4.RELEASE'
+}
+
 jib {
 	from {
 		image = 'adoptopenjdk:11-jre-openj9'
 	}
 	to {
-		image = "maxkey/maxkey-web-manage"
+		image = "maxkey/maxkey-mgt"
 		tags = ["${project.version}".toString(), 'latest']
 	}
 	container {
@@ -33,6 +36,7 @@ jib {
 		ports = ['80']
 	}
 }
+*/
 
 dependencies {
 	compile project(":maxkey-core")
diff --git a/maxkey-web-maxkey/build.gradle b/maxkey-web-maxkey/build.gradle
index e85e69277..f63ee2ed5 100644
--- a/maxkey-web-maxkey/build.gradle
+++ b/maxkey-web-maxkey/build.gradle
@@ -6,10 +6,7 @@ buildscript {
 	}
 }
 
-plugins {
-	id 'com.google.cloud.tools.jib' version '2.6.0'
-	id 'org.springframework.boot' version '2.3.4.RELEASE'
-}
+
 
 description = "maxkey-web-maxkey"
 
@@ -20,12 +17,18 @@ apply plugin: 'java'
 //apply plugin: 'com.bmuschko.tomcat-base'
 //apply plugin: 'com.bmuschko.tomcat'
 
+/*
+plugins {
+	id 'com.google.cloud.tools.jib' version '2.6.0'
+	id 'org.springframework.boot' version '2.3.4.RELEASE'
+}
+
 jib {
 	from {
 		image = 'adoptopenjdk:11-jre-openj9'
 	}
 	to {
-		image = "maxkey/maxkey-web-maxkey"
+		image = "maxkey/maxkey"
 		tags = ["${project.version}".toString(), 'latest']
 	}
 	container {
@@ -33,6 +36,7 @@ jib {
 		ports = ['80']
 	}
 }
+*/
 
 dependencies {
 	compile project(":maxkey-core")
-- 
GitLab