thingsboard-developers
Changes
application/pom.xml 4(+2 -2)
docker-compose.yml 18(+18 -0)
Dockerfile 14(+14 -0)
msa/js-executor/pom.xml 4(+2 -2)
msa/web-ui/pom.xml 4(+2 -2)
pom.xml 4(+2 -2)
run.sh 10(+10 -0)
transport/coap/pom.xml 4(+2 -2)
transport/http/pom.xml 4(+2 -2)
transport/mqtt/pom.xml 4(+2 -2)
ui/package-lock.json 28(+21 -7)
Details
application/pom.xml 4(+2 -2)
diff --git a/application/pom.xml b/application/pom.xml
index 437237f..8b37284 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -558,7 +558,7 @@
</execution>
</executions>
</plugin>
- <plugin>
+ <!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
@@ -576,7 +576,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin> -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
diff --git a/application/src/main/scripts/install/install_dev_db.sh b/application/src/main/scripts/install/install_dev_db.sh
index 212a2ac..1714ddd 100644
--- a/application/src/main/scripts/install/install_dev_db.sh
+++ b/application/src/main/scripts/install/install_dev_db.sh
@@ -16,9 +16,9 @@
#
-BASE=${project.basedir}/target
+BASE="`pwd`/../../../../target"
CONF_FOLDER=${BASE}/conf
-jarfile="${BASE}/thingsboard-${project.version}-boot.jar"
+jarfile="${BASE}/thingsboard-2.2.0-boot.jar"
installDir=${BASE}/data
loadDemo=true
@@ -28,9 +28,7 @@ export LOADER_PATH=${BASE}/conf,${BASE}/extensions
export SQL_DATA_FOLDER=${SQL_DATA_FOLDER:-/tmp}
-run_user=thingsboard
-
-sudo -u "$run_user" -s /bin/sh -c "java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.ThingsboardInstallApplication \
+/bin/sh -c "java -cp ${jarfile} $JAVA_OPTS -Dloader.main=org.thingsboard.server.ThingsboardInstallApplication \
-Dinstall.data_dir=${installDir} \
-Dinstall.load_demo=${loadDemo} \
-Dspring.jpa.hibernate.ddl-auto=none \
docker-compose.yml 18(+18 -0)
diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 0000000..f14e8c0
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,18 @@
+version: "3"
+services:
+ application:
+ build: .
+ container_name: thingsboard
+ volumes:
+ - application:/application
+ - /root/.m2:/root/.m2
+ - ~/.npm:/root/.npm
+ restart: unless-stopped
+ ports:
+ - 8080:8080
+ logging:
+ options:
+ max-size: "10m"
+ max-file: "10"
+volumes:
+ application:
\ No newline at end of file
Dockerfile 14(+14 -0)
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..198fc64
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,14 @@
+FROM maven:3.3.9
+
+RUN curl -sL https://deb.nodesource.com/setup_11.x | bash -
+
+RUN apt-get update -qq
+
+RUN apt-get install -qq -y nodejs
+
+ADD . /application
+WORKDIR /application
+
+EXPOSE 8080
+
+CMD ["bash", "run.sh"]
\ No newline at end of file
msa/js-executor/pom.xml 4(+2 -2)
diff --git a/msa/js-executor/pom.xml b/msa/js-executor/pom.xml
index 82b8e41..8c38e4d 100644
--- a/msa/js-executor/pom.xml
+++ b/msa/js-executor/pom.xml
@@ -257,7 +257,7 @@
</execution>
</executions>
</plugin>
- <plugin>
+ <!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.0.0</version>
@@ -276,7 +276,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin> -->
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
msa/web-ui/pom.xml 4(+2 -2)
diff --git a/msa/web-ui/pom.xml b/msa/web-ui/pom.xml
index 54e8068..6bc2ed9 100644
--- a/msa/web-ui/pom.xml
+++ b/msa/web-ui/pom.xml
@@ -281,7 +281,7 @@
</execution>
</executions>
</plugin>
- <plugin>
+ <!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.0.0</version>
@@ -300,7 +300,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin> -->
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
pom.xml 4(+2 -2)
diff --git a/pom.xml b/pom.xml
index 456c240..f5e50dc 100755
--- a/pom.xml
+++ b/pom.xml
@@ -140,11 +140,11 @@
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
</plugin>
- <plugin>
+ <!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.0.0</version>
- </plugin>
+ </plugin> -->
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
run.sh 10(+10 -0)
diff --git a/run.sh b/run.sh
new file mode 100644
index 0000000..0d4b734
--- /dev/null
+++ b/run.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ ! -e compiled ]; then
+ mvn clean install -DskipTests -Dlicense.skip=true
+ cd application/src/main/scripts/install
+ bash install_dev_db.sh
+ cd ../../../../..
+ touch compiled
+fi
+java -jar application/target/thingsboard-2.2.0-boot.jar
transport/coap/pom.xml 4(+2 -2)
diff --git a/transport/coap/pom.xml b/transport/coap/pom.xml
index f36fb13..05bddbc 100644
--- a/transport/coap/pom.xml
+++ b/transport/coap/pom.xml
@@ -286,7 +286,7 @@
</execution>
</executions>
</plugin>
- <plugin>
+ <!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
@@ -304,7 +304,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin> -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
transport/http/pom.xml 4(+2 -2)
diff --git a/transport/http/pom.xml b/transport/http/pom.xml
index b957999..42a2f90 100644
--- a/transport/http/pom.xml
+++ b/transport/http/pom.xml
@@ -286,7 +286,7 @@
</execution>
</executions>
</plugin>
- <plugin>
+ <!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
@@ -304,7 +304,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin> -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
transport/mqtt/pom.xml 4(+2 -2)
diff --git a/transport/mqtt/pom.xml b/transport/mqtt/pom.xml
index 0ce0c67..3c2c88c 100644
--- a/transport/mqtt/pom.xml
+++ b/transport/mqtt/pom.xml
@@ -286,7 +286,7 @@
</execution>
</executions>
</plugin>
- <plugin>
+ <!-- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
@@ -304,7 +304,7 @@
</goals>
</execution>
</executions>
- </plugin>
+ </plugin> -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
ui/package-lock.json 28(+21 -7)
diff --git a/ui/package-lock.json b/ui/package-lock.json
index 80b3db3..084367b 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -5239,12 +5239,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -5259,17 +5261,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"core-util-is": {
"version": "1.0.2",
@@ -5386,7 +5391,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"ini": {
"version": "1.3.5",
@@ -5398,6 +5404,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -5412,6 +5419,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -5419,12 +5427,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
@@ -5443,6 +5453,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -5523,7 +5534,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"object-assign": {
"version": "4.1.1",
@@ -5535,6 +5547,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"wrappy": "1"
}
@@ -5656,6 +5669,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",