From: m.dalakov <m.dalakov@samsung.com>
Date: Tue, 21 Nov 2017 12:56:51 +0000 (+0200)
Subject: *[SECIOTSRK-696] Dockerization dev-manager: reg devices to different users
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d7bc52e36ea0e06d18c70807b8fe6c7945cb2169;p=platform%2Fcore%2Fsecurity%2Fsuspicious-activity-monitor.git

*[SECIOTSRK-696] Dockerization dev-manager: reg devices to different users
---

diff --git a/servers/services/dev-manager/.devices b/servers/services/dev-manager/.devices
index 816c46d..d1ae1cd 100644
--- a/servers/services/dev-manager/.devices
+++ b/servers/services/dev-manager/.devices
@@ -1,7 +1,3 @@
-1,"Tv 5500","model3.4","tv","hub"
-2,"Air Conditioner","hd 3300","airconditioner","standard"
-3,"Cool phone","Tizen Z3","phone","standard"
-4,"iRobot","T 1000","robotcleaner","primitive"
-5,"Washing machine","WM10","washer","primitive"
-6,"Kitchen plug","220v","smartplug","primitive"
-7,"Fridge","Ice T","refrigerator","standard"
+12,"Air Conditioner","hd 3300","airconditioner","standard"
+13,"Cool phone","Tizen Z3","phone","standard"
+17,"Fridge","Ice T","refrigerator","standard"
\ No newline at end of file
diff --git a/servers/services/dev-manager/.devices2 b/servers/services/dev-manager/.devices2
new file mode 100644
index 0000000..c5298d5
--- /dev/null
+++ b/servers/services/dev-manager/.devices2
@@ -0,0 +1,4 @@
+91,"Tv 5500","model3.4","tv","hub"
+94,"iRobot","T 1000","robotcleaner","primitive"
+95,"Washing machine","WM10","washer","primitive"
+96,"Kitchen plug","220v","smartplug","primitive"
\ No newline at end of file
diff --git a/servers/services/dev-manager/Dockerfile b/servers/services/dev-manager/Dockerfile
index a0122a5..a1680f3 100644
--- a/servers/services/dev-manager/Dockerfile
+++ b/servers/services/dev-manager/Dockerfile
@@ -1,7 +1,8 @@
 FROM ubuntu:16.04
 
-ADD ./target/dev-manager-1.0.zip /usr/lib/
+ADD ./target/dev-manager-1.1.zip /usr/lib/
 ADD ./.devices /usr/lib/
+ADD ./.devices2 /usr/lib/
 
 WORKDIR /usr/lib/
 
@@ -9,4 +10,4 @@ RUN mv ./dev-manager/** ./
 RUN chmod a+x ./dev-manager.sh
 RUN chmod a+x ./dev-all.sh
 RUN chmod a+x ./nmdaemon
-RUN chmod a+x ./utest
+RUN chmod a+x ./pair
\ No newline at end of file
diff --git a/servers/services/dev-manager/pom.xml b/servers/services/dev-manager/pom.xml
index b707195..581b0ba 100644
--- a/servers/services/dev-manager/pom.xml
+++ b/servers/services/dev-manager/pom.xml
@@ -22,7 +22,7 @@
 		<dependency>
 			<groupId>iotswsec</groupId>
 			<artifactId>dev-manager</artifactId>
-			<version>1.0</version>
+			<version>1.1</version>
 			<type>zip</type>
 		</dependency>
 	</dependencies>
@@ -41,7 +41,7 @@
 							<goal>copy-dependencies</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${project.build.directory}</outputDirectory>
+							<outputDirectory>${project.basedir}/target</outputDirectory>
 						</configuration>
 					</execution>
 				</executions>
@@ -52,7 +52,7 @@
 				<configuration>
 					<images>
 						<image>
-							<name>dev-manager:1.0</name>
+							<name>dev-manager:1.1</name>
 							<build>
 								<dockerFile>${project.basedir}/Dockerfile</dockerFile>
 							</build>