From 8a81544489e355ca54f5218940667e3e235d9c6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=88=90=E4=B9=89?= <alanland@163.com>
Date: Tue, 3 Nov 2020 19:25:46 +0800
Subject: [PATCH] add jib(docker) support

---
 build.gradle                   | 10 +++++-----
 maxkey-web-manage/build.gradle | 32 ++++++++++++++++++++++++-------
 maxkey-web-maxkey/build.gradle | 35 ++++++++++++++++++++++++++--------
 3 files changed, 57 insertions(+), 20 deletions(-)

diff --git a/build.gradle b/build.gradle
index eff6d0b78..35c0ce2a3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -32,11 +32,11 @@ allprojects {
 	
 	eclipse {
 		/*第一次时请注释这段eclipse设置，可能报错*/
-		jdt  {
-		    File f = file('.settings/org.eclipse.core.resources.prefs')
-		    f.write('eclipse.preferences.version=1\n')
-		    f.append('encoding/<project>=UTF-8') //use UTF-8
-		}
+//		jdt  {
+//		    File f = file('.settings/org.eclipse.core.resources.prefs')
+//		    f.write('eclipse.preferences.version=1\n')
+//		    f.append('encoding/<project>=UTF-8') //use UTF-8
+//		}
 		
 		
 		/*
diff --git a/maxkey-web-manage/build.gradle b/maxkey-web-manage/build.gradle
index 2c4995fc8..01b4321b9 100644
--- a/maxkey-web-manage/build.gradle
+++ b/maxkey-web-manage/build.gradle
@@ -1,3 +1,16 @@
+buildscript {
+	repositories {
+		jcenter()
+	}
+	dependencies {
+	}
+}
+
+plugins {
+	id 'com.google.cloud.tools.jib' version '2.6.0'
+	id 'org.springframework.boot' version '2.3.4.RELEASE'
+}
+
 description = "maxkey-web-manage"
 
 // Apply the java plugin to add support for Java
@@ -7,13 +20,18 @@ apply plugin: 'java'
 //apply plugin: 'com.bmuschko.tomcat-base'
 //apply plugin: 'com.bmuschko.tomcat'
 
-buildscript {
-  repositories {
-  jcenter()
-  }
-  dependencies {
-  	//classpath "com.bmuschko:gradle-tomcat-plugin:2.2.3"
-  }
+jib {
+	from {
+		image = 'adoptopenjdk:11-jre-openj9'
+	}
+	to {
+		image = "maxkey/maxkey-web-manage"
+		tags = ["${project.version}".toString(), 'latest']
+	}
+	container {
+		jvmFlags = ['-Dfile.encoding=utf-8', '-Dserver.port=80']
+		ports = ['80']
+	}
 }
 
 dependencies {
diff --git a/maxkey-web-maxkey/build.gradle b/maxkey-web-maxkey/build.gradle
index c07b84378..e85e69277 100644
--- a/maxkey-web-maxkey/build.gradle
+++ b/maxkey-web-maxkey/build.gradle
@@ -1,3 +1,16 @@
+buildscript {
+	repositories {
+		jcenter()
+	}
+	dependencies {
+	}
+}
+
+plugins {
+	id 'com.google.cloud.tools.jib' version '2.6.0'
+	id 'org.springframework.boot' version '2.3.4.RELEASE'
+}
+
 description = "maxkey-web-maxkey"
 
 // Apply the java plugin to add support for Java
@@ -7,15 +20,21 @@ apply plugin: 'java'
 //apply plugin: 'com.bmuschko.tomcat-base'
 //apply plugin: 'com.bmuschko.tomcat'
 
-buildscript {
-  repositories {
-  jcenter()
-  }
-  dependencies {
-  	//classpath "com.bmuschko:gradle-tomcat-plugin:2.2.3"
-  }
+jib {
+	from {
+		image = 'adoptopenjdk:11-jre-openj9'
+	}
+	to {
+		image = "maxkey/maxkey-web-maxkey"
+		tags = ["${project.version}".toString(), 'latest']
+	}
+	container {
+		jvmFlags = ['-Dfile.encoding=utf-8', '-Dserver.port=80']
+		ports = ['80']
+	}
 }
-dependencies {         	
+
+dependencies {
 	compile project(":maxkey-core")
 	compile project(":maxkey-persistence")