引入 multi-tenant library 并完成初步测试
diff --git a/ynrcc-agent/Dockerfile b/ynrcc-agent/Dockerfile
index 3305510..41018d3 100644
--- a/ynrcc-agent/Dockerfile
+++ b/ynrcc-agent/Dockerfile
@@ -1,6 +1,7 @@
FROM openjdk:8
+ARG BUILD_VERSION
-COPY ynrcc-agent-1.jar /opt/agent/agent.jar
+COPY ynrcc-agent-${BUILD_VERSION}.jar /opt/agent/agent.jar
EXPOSE 8080
diff --git a/ynrcc-agent/build.gradle b/ynrcc-agent/build.gradle
index 01a06b5..4d1c0fa 100644
--- a/ynrcc-agent/build.gradle
+++ b/ynrcc-agent/build.gradle
@@ -13,8 +13,10 @@
println("Build version: $buildVersion")
+
bootJar {
mainClassName = ynrccStartClass
+ archiveFileName = "${project.name}-${buildVersion}.${archiveExtension.getOrElse('.jar')}"
manifest {
attributes('YnrccAgent-Version': buildVersion)
}
@@ -43,12 +45,11 @@
}
println("Docker image tag : ${imageVersion}")
name "${dockerRegistry}/ynrcc:${imageVersion}"
- println(jar.archiveFile.get())
- files jar.archiveFile.get()
+ println(bootJar.archiveFile.get())
+ files bootJar.archiveFile.get()
+ buildArgs([BUILD_VERSION: "${buildVersion}"])
}
-docker.dependsOn(jar)
-
dependencies {
implementation project(":payapi-common")