Browse Source
Merge pull request #9481 from smatvienko-tb/feature/docker-images-update-3.6.1
Feature/docker images update 3.6.1
pull/9545/head
Andrew Shvayka
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with
7 additions and
8 deletions
-
docker/docker-compose.yml
-
msa/js-executor/docker/Dockerfile
-
msa/js-executor/pom.xml
-
msa/tb-node/docker/Dockerfile
-
msa/web-ui/docker/Dockerfile
-
msa/web-ui/pom.xml
-
ui-ngx/pom.xml
|
|
|
@ -300,7 +300,7 @@ services: |
|
|
|
haproxy: |
|
|
|
restart: always |
|
|
|
container_name: "${LOAD_BALANCER_NAME}" |
|
|
|
image: thingsboard/haproxy-certbot:1.3.0 |
|
|
|
image: thingsboard/haproxy-certbot:2.2.31-alpine3.18 |
|
|
|
volumes: |
|
|
|
- ./haproxy/config:/config |
|
|
|
- ./haproxy/letsencrypt:/etc/letsencrypt |
|
|
|
|
|
|
|
@ -14,7 +14,7 @@ |
|
|
|
# limitations under the License. |
|
|
|
# |
|
|
|
|
|
|
|
FROM thingsboard/node:16.17.0-bullseye-slim |
|
|
|
FROM thingsboard/node:16.20.2-bookworm-slim |
|
|
|
|
|
|
|
ENV NODE_ENV production |
|
|
|
ENV DOCKER_MODE true |
|
|
|
|
|
|
|
@ -71,7 +71,7 @@ |
|
|
|
<goal>install-node-and-yarn</goal> |
|
|
|
</goals> |
|
|
|
<configuration> |
|
|
|
<nodeVersion>v16.15.1</nodeVersion> |
|
|
|
<nodeVersion>v16.20.2</nodeVersion> |
|
|
|
<yarnVersion>v1.22.17</yarnVersion> |
|
|
|
</configuration> |
|
|
|
</execution> |
|
|
|
|
|
|
|
@ -18,8 +18,7 @@ FROM thingsboard/openjdk11:bullseye-slim |
|
|
|
|
|
|
|
COPY start-tb-node.sh ${pkg.name}.deb /tmp/ |
|
|
|
|
|
|
|
RUN echo 'networkaddress.cache.ttl=60' >> /etc/java-11-openjdk/security/java.security \ |
|
|
|
&& chmod a+x /tmp/*.sh \ |
|
|
|
RUN chmod a+x /tmp/*.sh \ |
|
|
|
&& mv /tmp/start-tb-node.sh /usr/bin && \ |
|
|
|
(yes | dpkg -i /tmp/${pkg.name}.deb) && \ |
|
|
|
rm /tmp/${pkg.name}.deb && \ |
|
|
|
|
|
|
|
@ -14,7 +14,7 @@ |
|
|
|
# limitations under the License. |
|
|
|
# |
|
|
|
|
|
|
|
FROM thingsboard/node:16.17.0-bullseye-slim |
|
|
|
FROM thingsboard/node:16.20.2-bookworm-slim |
|
|
|
|
|
|
|
ENV NODE_ENV production |
|
|
|
ENV DOCKER_MODE true |
|
|
|
|
|
|
|
@ -80,7 +80,7 @@ |
|
|
|
<goal>install-node-and-yarn</goal> |
|
|
|
</goals> |
|
|
|
<configuration> |
|
|
|
<nodeVersion>v16.15.1</nodeVersion> |
|
|
|
<nodeVersion>v16.20.2</nodeVersion> |
|
|
|
<yarnVersion>v1.22.17</yarnVersion> |
|
|
|
</configuration> |
|
|
|
</execution> |
|
|
|
|
|
|
|
@ -56,7 +56,7 @@ |
|
|
|
<goal>install-node-and-yarn</goal> |
|
|
|
</goals> |
|
|
|
<configuration> |
|
|
|
<nodeVersion>v16.15.1</nodeVersion> |
|
|
|
<nodeVersion>v16.20.2</nodeVersion> |
|
|
|
<yarnVersion>v1.22.17</yarnVersion> |
|
|
|
</configuration> |
|
|
|
</execution> |
|
|
|
|
