Merge branch 'master' into flyway

Realtime-Location-Service · Jul 16, 2019 · 895cbf0 · 895cbf0
2 parents a3c73a7 + 571f1c9
commit 895cbf0
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -71,9 +71,9 @@ gradle-app.setting
 # When using Gradle or Maven with auto-import, you should exclude module files,
 # since they will be recreated, and may cause churn.  Uncomment if using
 # auto-import.
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
+.idea/modules.xml
+.idea/*.iml
+.idea/modules
 
 # CMake
 cmake-build-*/

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/modules/sazid1462.ID-Service.iml → .idea/modules/rls42.ID-Service.iml b/.idea/modules/sazid1462.ID-Service.iml → .idea/modules/rls42.ID-Service.iml
diff --git a/.idea/modules/sazid1462.ID-Service.main.iml → .idea/modules/rls42.ID-Service.main.iml b/.idea/modules/sazid1462.ID-Service.main.iml → .idea/modules/rls42.ID-Service.main.iml
diff --git a/.idea/modules/sazid1462.ID-Service.test.iml → .idea/modules/rls42.ID-Service.test.iml b/.idea/modules/sazid1462.ID-Service.test.iml → .idea/modules/rls42.ID-Service.test.iml
diff --git a/build.gradle b/build.gradle
@@ -12,7 +12,7 @@ buildscript {
     }
 }
 
-group = 'sazid1462'
+group = 'rls42'
 
 apply plugin: 'java'
 apply plugin: 'eclipse'
@@ -47,7 +47,7 @@ task unpack(type: Copy) {
 }
 
 docker {
-    name "${project.group}/${bootJar.baseName}"
+    name "${project.group}/${bootJar.baseName}:${bootJar.version}"
     copySpec.from(tasks.unpack.outputs).into("dependency")
     buildArgs(['DEPENDENCY': "dependency"])
 }