tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

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

pull/5733/head
Andrii Shvaika 5 years ago
parent
7de1343df0 60079fc88c
commit
0a7f4c0070
11 changed files with 143 additions and 111 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      msa/js-executor/docker/Dockerfile
  2. 6
      msa/js-executor/docker/start-js-executor.sh
  3. 7
      msa/js-executor/install.js
  4. 5
      msa/js-executor/package.json
  5. 64
      msa/js-executor/pom.xml
  6. 28
      msa/web-ui/docker/Dockerfile
  7. 6
      msa/web-ui/docker/start-web-ui.sh
  8. 7
      msa/web-ui/install.js
  9. 5
      msa/web-ui/package.json
  10. 32
      msa/web-ui/pom.xml
  11. 65
      packaging/js/build.gradle

29
msa/js-executor/docker/Dockerfile
View File

@ -14,26 +14,29 @@
# limitations under the License.
#
FROM thingsboard/base
FROM node:16.13.1-buster-slim
ARG TARGETPLATFORM
COPY start-js-executor.sh ${pkg.name}.deb ${pkg.name}-arm64.deb /tmp/
COPY start-js-executor.sh /tmp/
RUN chmod a+x /tmp/*.sh \
&& mv /tmp/start-js-executor.sh /usr/bin
RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; \
then yes | dpkg -i /tmp/${pkg.name}-arm64.deb; \
else yes | dpkg -i /tmp/${pkg.name}.deb; \
fi
RUN rm /tmp/${pkg.name}.deb
RUN rm /tmp/${pkg.name}-arm64.deb
ENV NODE_ENV production
WORKDIR ${pkg.installFolder}
COPY ["src/package.json", "src/yarn.lock", "./"]
COPY package/linux/conf ./conf
COPY package/linux/conf ./config
COPY src/api ./api
COPY src/queue ./queue
COPY src/server.js ./
RUN systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :
RUN chown -R node:node ${pkg.installFolder}
RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}
RUN yarn install --production && yarn cache clean --all
USER ${pkg.user}
USER node
CMD ["start-js-executor.sh"]

6
msa/js-executor/docker/start-js-executor.sh
View File

@ -20,12 +20,10 @@ echo "Starting '${project.name}' ..."
CONF_FOLDER="${pkg.installFolder}/conf"
mainfile=${pkg.installFolder}/bin/${pkg.name}
configfile=${pkg.name}.conf
identity=${pkg.name}
source "${CONF_FOLDER}/${configfile}"
cd ${pkg.installFolder}/bin
cd ${pkg.installFolder}
exec /bin/sh -c "$mainfile"
exec /bin/sh -c "node server.js"

7
msa/js-executor/install.js
View File

@ -21,13 +21,10 @@ let _projectRoot = null;
(async() => {
await fse.move(path.join(projectRoot(), 'target', 'thingsboard-js-executor-linux-x64'),
await fse.move(path.join(projectRoot(), 'target', 'thingsboard-js-executor-linux'),
path.join(targetPackageDir('linux'), 'bin', 'tb-js-executor'),
{overwrite: true});
await fse.move(path.join(projectRoot(), 'target', 'thingsboard-js-executor-linux-arm64'),
path.join(targetPackageDir('linux'), 'bin-arm64', 'tb-js-executor'),
{overwrite: true});
await fse.move(path.join(projectRoot(), 'target', 'thingsboard-js-executor-win-x64.exe'),
await fse.move(path.join(projectRoot(), 'target', 'thingsboard-js-executor-win.exe'),
path.join(targetPackageDir('windows'), 'bin', 'tb-js-executor.exe'),
{overwrite: true});
})();

5
msa/js-executor/package.json
View File

@ -6,7 +6,7 @@
"main": "server.js",
"bin": "server.js",
"scripts": {
"install": "pkg -t node12-linux-x64,node12-linux-arm64,node12-win-x64 --out-path ./target . && node install.js",
"pkg": "pkg -t node12-linux-x64,node12-win-x64 --out-path ./target . && node install.js",
"test": "echo \"Error: no test specified\" && exit 1",
"start": "nodemon server.js",
"start-prod": "NODE_ENV=production nodemon server.js"
@ -27,9 +27,6 @@
"winston": "^3.3.3",
"winston-daily-rotate-file": "^4.5.0"
},
"engines": {
"node": ">=12.0.0 <14.0.0"
},
"nyc": {
"exclude": [
"test",

64
msa/js-executor/pom.xml
View File

@ -84,6 +84,15 @@
<arguments>install</arguments>
</configuration>
</execution>
<execution>
<id>yarn pkg</id>
<goals>
<goal>yarn</goal>
</goals>
<configuration>
<arguments>run pkg</arguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
@ -93,6 +102,61 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-src-api</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/src/api</outputDirectory>
<resources>
<resource>
<directory>api</directory>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-src-queue</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/src/queue</outputDirectory>
<resources>
<resource>
<directory>queue</directory>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
<execution>
<id>copy-src-root</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/src</outputDirectory>
<resources>
<resource>
<directory>${basedir}</directory>
<includes>
<include>server.js</include>
<include>package.json</include>
<include>yarn.lock</include>
</includes>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.thingsboard</groupId>

28
msa/web-ui/docker/Dockerfile
View File

@ -14,26 +14,28 @@
# limitations under the License.
#
FROM thingsboard/base
FROM node:16.13.1-buster-slim
ARG TARGETPLATFORM
COPY start-web-ui.sh ${pkg.name}.deb ${pkg.name}-arm64.deb /tmp/
COPY start-web-ui.sh /tmp/
RUN chmod a+x /tmp/*.sh \
&& mv /tmp/start-web-ui.sh /usr/bin
RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; \
then yes | dpkg -i /tmp/${pkg.name}-arm64.deb; \
else yes | dpkg -i /tmp/${pkg.name}.deb; \
fi
RUN rm /tmp/${pkg.name}.deb
RUN rm /tmp/${pkg.name}-arm64.deb
ENV NODE_ENV production
WORKDIR ${pkg.installFolder}
COPY ["src/package.json", "src/yarn.lock", "./"]
COPY package/linux/conf ./conf
COPY package/linux/conf ./config
COPY web ./web
COPY src/server.js ./
RUN systemctl --no-reload disable --now ${pkg.name}.service > /dev/null 2>&1 || :
RUN chown -R node:node ${pkg.installFolder}
RUN chmod 555 ${pkg.installFolder}/bin/${pkg.name}
RUN yarn install --production && yarn cache clean --all
USER ${pkg.user}
USER node
CMD ["start-web-ui.sh"]

6
msa/web-ui/docker/start-web-ui.sh
View File

@ -20,12 +20,10 @@ echo "Starting '${project.name}' ..."
CONF_FOLDER="${pkg.installFolder}/conf"
mainfile=${pkg.installFolder}/bin/${pkg.name}
configfile=${pkg.name}.conf
identity=${pkg.name}
source "${CONF_FOLDER}/${configfile}"
cd ${pkg.installFolder}/bin
cd ${pkg.installFolder}
exec /bin/sh -c "$mainfile"
exec /bin/sh -c "node server.js"

7
msa/web-ui/install.js
View File

@ -21,13 +21,10 @@ let _projectRoot = null;
(async() => {
await fse.move(path.join(projectRoot(), 'target', 'thingsboard-web-ui-linux-x64'),
await fse.move(path.join(projectRoot(), 'target', 'thingsboard-web-ui-linux'),
path.join(targetPackageDir('linux'), 'bin', 'tb-web-ui'),
{overwrite: true});
await fse.move(path.join(projectRoot(), 'target', 'thingsboard-web-ui-linux-arm64'),
path.join(targetPackageDir('linux'), 'bin-arm64', 'tb-web-ui'),
{overwrite: true});
await fse.move(path.join(projectRoot(), 'target', 'thingsboard-web-ui-win-x64.exe'),
await fse.move(path.join(projectRoot(), 'target', 'thingsboard-web-ui-win.exe'),
path.join(targetPackageDir('windows'), 'bin', 'tb-web-ui.exe'),
{overwrite: true});
})();

5
msa/web-ui/package.json
View File

@ -6,7 +6,7 @@
"main": "server.js",
"bin": "server.js",
"scripts": {
"install": "pkg -t node12-linux-x64,node12-linux-arm64,node12-win-x64 --out-path ./target . && node install.js",
"pkg": "pkg -t node12-linux-x64,node12-win-x64 --out-path ./target . && node install.js",
"test": "echo \"Error: no test specified\" && exit 1",
"start": "WEB_FOLDER=./target/web nodemon server.js",
"start-prod": "NODE_ENV=production nodemon server.js"
@ -22,9 +22,6 @@
"winston": "^3.3.3",
"winston-daily-rotate-file": "^4.5.0"
},
"engines": {
"node": ">=12.0.0 <14.0.0"
},
"nyc": {
"exclude": [
"test",

32
msa/web-ui/pom.xml
View File

@ -93,6 +93,15 @@
<arguments>install</arguments>
</configuration>
</execution>
<execution>
<id>yarn pkg</id>
<goals>
<goal>yarn</goal>
</goals>
<configuration>
<arguments>run pkg</arguments>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
@ -140,6 +149,29 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>copy-src-root</id>
<phase>process-resources</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${project.build.directory}/src</outputDirectory>
<resources>
<resource>
<directory>${basedir}</directory>
<includes>
<include>server.js</include>
<include>package.json</include>
<include>yarn.lock</include>
</includes>
<filtering>false</filtering>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.thingsboard</groupId>

65
packaging/js/build.gradle
View File

@ -36,6 +36,12 @@ ospackage {
user pkgUser
permissionGroup pkgUser
// Copy the executable file
from("${buildDir}/package/linux/bin/${pkgName}") {
fileMode 0500
into "bin"
}
// Copy the init file
from("${buildDir}/package/linux/init/template") {
fileMode 0500
@ -72,17 +78,9 @@ buildRpm {
preUninstall file("${buildDir}/control/rpm/prerm")
postUninstall file("${buildDir}/control/rpm/postrm")
into pkgInstallFolder
user pkgUser
permissionGroup pkgUser
// Copy the executable file
from("${buildDir}/package/linux/bin/${pkgName}") {
fileMode 0500
into "bin"
}
// Copy the system unit files
from("${buildDir}/control/template.service") {
addParentDirs = false
@ -113,58 +111,9 @@ buildDeb {
preUninstall file("${buildDir}/control/deb/prerm")
postUninstall file("${buildDir}/control/deb/postrm")
into pkgInstallFolder
user pkgUser
permissionGroup pkgUser
// Copy the executable file
from("${buildDir}/package/linux/bin/${pkgName}") {
fileMode 0500
into "bin"
}
// Copy the system unit files
from("${buildDir}/control/template.service") {
addParentDirs = false
fileMode 0644
into "/lib/systemd/system"
rename { String filename ->
"${pkgName}.service"
}
}
link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf")
}
// Same as the buildRpm task
task buildDebArm64(type: Deb) {
arch = "arm64"
archiveFileName = "${pkgName}-arm64.deb"
configurationFile("${pkgInstallFolder}/conf/${pkgName}.conf")
configurationFile("${pkgInstallFolder}/conf/custom-environment-variables.yml")
configurationFile("${pkgInstallFolder}/conf/default.yml")
configurationFile("${pkgInstallFolder}/conf/logger.js")
preInstall file("${buildDir}/control/deb/preinst")
postInstall file("${buildDir}/control/deb/postinst")
preUninstall file("${buildDir}/control/deb/prerm")
postUninstall file("${buildDir}/control/deb/postrm")
into pkgInstallFolder
user pkgUser
permissionGroup pkgUser
// Copy the executable file
from("${buildDir}/package/linux/bin-arm64/${pkgName}") {
fileMode 0500
into "bin"
}
// Copy the system unit files
from("${buildDir}/control/template.service") {
addParentDirs = false
@ -177,5 +126,3 @@ task buildDebArm64(type: Deb) {
link("/etc/${pkgName}/conf", "${pkgInstallFolder}/conf")
}
buildDeb.finalizedBy buildDebArm64

Write Preview
Loading…
Cancel
Save