x

tuon-web/build.gradle

@@ -24,9 +24,9 @@ dependencies {
 
 task dockerBuilder(type: Docker) {
    registry='docker.tonyandmoney.cn'
-   applicationName = 'tuonq-config'
-   tagVersion = jar.getArchiveVersion()
-   addFile("./${jar.getArchiveBaseName()}-${jar.getArchiveVersion()}.jar","app.jar")
+   applicationName = 'tuon-fw'
+   tagVersion = jar.version
+   addFile("./${jar.baseName}-${jar.version}.jar","app.jar")
    entryPoint(["java","-XX:+UnlockExperimentalVMOptions","-XX:+UseCGroupMemoryLimitForHeap","-Djava.security.egd=file:/dev/./urandom","-Duser.timezone=GMT+08","-jar",'app.jar'])
    exposePort(11000)
    doFirst {
@@ -37,12 +37,13 @@ task dockerBuilder(type: Docker) {
    }
    push = true
 }
+dockerBuilder.dependsOn(bootJar)
 
 task innerDockerBuilder(type: Docker){
    registry='registry.tuonq.cn:5000'
    applicationName = 'tuonq-config'
-   tagVersion = jar.getArchiveVersion()
-   addFile("./${jar.getArchiveBaseName()}-${jar.getArchiveVersion()}.jar","app.jar")
+   tagVersion = jar.version
+   addFile("./${jar.baseName}-${jar.version}.jar","app.jar")
    entryPoint(["java","-XX:+UnlockExperimentalVMOptions","-XX:+UseCGroupMemoryLimitForHeap","-Djava.security.egd=file:/dev/./urandom","-Duser.timezone=GMT+08","-jar",'app.jar'])
    exposePort(11000)
    doFirst {
@@ -54,5 +55,4 @@ task innerDockerBuilder(type: Docker){
    push = true
 }
 
-dockerBuilder.dependsOn(bootJar)
 innerDockerBuilder.dependsOn(bootJar)