简柏林 / thingskit · Commits

Commit d342e4534eafee796a57b0f1983a5f0d828cf23d

Authored by Andrew Shvayka
2 parents 6165b908 83a55468

Merge branch 'master' of github.com:thingsboard/thingsboard

Inline Side-by-side
Showing 8 changed files with 8 additions and 8 deletions
@@ -40,7 +40,7 @@ @@ -40,7 +40,7 @@
40 </encoder> 40 </encoder>
41 </appender> 41 </appender>
42 42
43 - <logger name="org.thingsboard.server" level="TRACE" /> 43 + <logger name="org.thingsboard.server" level="INFO" />
44 <logger name="akka" level="INFO" /> 44 <logger name="akka" level="INFO" />
45 45
46 <root level="INFO"> 46 <root level="INFO">
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 # limitations under the License. 14 # limitations under the License.
15 # 15 #
16 16
17 -FROM openjdk:8-jre 17 +FROM openjdk:8-jdk
18 18
19 COPY start-tb-node.sh ${pkg.name}.deb /tmp/ 19 COPY start-tb-node.sh ${pkg.name}.deb /tmp/
20 20
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 # limitations under the License. 14 # limitations under the License.
15 # 15 #
16 16
17 -FROM openjdk:8-jre 17 +FROM openjdk:8-jdk
18 18
19 RUN apt-get update 19 RUN apt-get update
20 RUN apt-get install -y curl nmap procps 20 RUN apt-get install -y curl nmap procps
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 # limitations under the License. 14 # limitations under the License.
15 # 15 #
16 16
17 -FROM openjdk:8-jre 17 +FROM openjdk:8-jdk
18 18
19 RUN apt-get update 19 RUN apt-get update
20 RUN apt-get install -y postgresql postgresql-contrib 20 RUN apt-get install -y postgresql postgresql-contrib
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 # limitations under the License. 14 # limitations under the License.
15 # 15 #
16 16
17 -FROM openjdk:8-jre 17 +FROM openjdk:8-jdk
18 18
19 COPY logback.xml ${pkg.name}.conf start-db.sh stop-db.sh start-tb.sh upgrade-tb.sh install-tb.sh ${pkg.name}.deb /tmp/ 19 COPY logback.xml ${pkg.name}.conf start-db.sh stop-db.sh start-tb.sh upgrade-tb.sh install-tb.sh ${pkg.name}.deb /tmp/
20 20
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 # limitations under the License. 14 # limitations under the License.
15 # 15 #
16 16
17 -FROM openjdk:8-jre 17 +FROM openjdk:8-jdk
18 18
19 COPY logback.xml ${pkg.name}.conf start-tb-coap-transport.sh ${pkg.name}.deb /tmp/ 19 COPY logback.xml ${pkg.name}.conf start-tb-coap-transport.sh ${pkg.name}.deb /tmp/
20 20
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 # limitations under the License. 14 # limitations under the License.
15 # 15 #
16 16
17 -FROM openjdk:8-jre 17 +FROM openjdk:8-jdk
18 18
19 COPY logback.xml ${pkg.name}.conf start-tb-http-transport.sh ${pkg.name}.deb /tmp/ 19 COPY logback.xml ${pkg.name}.conf start-tb-http-transport.sh ${pkg.name}.deb /tmp/
20 20
@@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
14 # limitations under the License. 14 # limitations under the License.
15 # 15 #
16 16
17 -FROM openjdk:8-jre 17 +FROM openjdk:8-jdk
18 18
19 COPY logback.xml ${pkg.name}.conf start-tb-mqtt-transport.sh ${pkg.name}.deb /tmp/ 19 COPY logback.xml ${pkg.name}.conf start-tb-mqtt-transport.sh ${pkg.name}.deb /tmp/
20 20