Merge branch 'thinx-staging'

* thinx-staging: fix: package.json & package-lock.json to reduce vulnerabilities GDPR notification scheduler fix fix: upgrade semver from 7.5.3 to 7.6.3 fix: upgrade moment-timezone from 0.5.40 to 0.5.46 fix: upgrade qs from 6.10.3 to 6.13.0 fix: upgrade yaml from 2.2.2 to 2.6.0 reviewed all builders CI pipelines moved extra_build_args to single line after passing the test, debugging issue with buildx in build-console-classic step (and new docker orb) network external could not be found debugging mqtt dns issue: downgraded mqtt client, upgraded docker orb to latest supported, changed internal network from type external to internal submodule updates
suculent · Nov 27, 2024 · f2011e6 · f2011e6
2 parents 184139e + 88a1619
commit f2011e6
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 182 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,15 +1,16 @@
 version: 2.1
 orbs:
   node: circleci/[email protected]
-  docker: circleci/docker@2.0.3
+  docker: circleci/docker@2.7.1
   slack: circleci/[email protected]
 
 jobs:
 
   build-base:
     executor: docker/docker
     steps:
-      - setup_remote_docker
+      - setup_remote_docker:
+          version: previous
       - checkout
       - docker/check
       - run:
@@ -31,8 +32,8 @@ jobs:
   build-console-cloud:
     executor: docker/docker
     steps:
-      - setup_remote_docker
-#          version: 20.10.18
+      - setup_remote_docker:
+          version: previous
       - checkout
       - run:
           name: Fetch all dependencies (esp. console)
@@ -73,8 +74,8 @@ jobs:
   build-console-classic:
     executor: docker/docker
     steps:
-      - setup_remote_docker
-#          version: 20.10.18
+      - setup_remote_docker:
+          version: 20.10.24
       - checkout
       - run:
           name: Fetch all dependencies (esp. console)
@@ -87,18 +88,7 @@ jobs:
           docker-context: services/console/src
           image: thinx/console
           dockerfile: services/console/src/Dockerfile
-          extra_build_args: |
-            --build-arg ROLLBAR_ACCESS_TOKEN=${ROLLBAR_ACCESS_TOKEN} \
-            --build-arg LANDING_HOSTNAME=${LANDING_HOSTNAME} \
-            --build-arg API_HOSTNAME=${API_HOSTNAME} \
-            --build-arg API_BASEURL=${API_BASEURL} \
-            --build-arg WEB_HOSTNAME=${WEB_HOSTNAME} \
-            --build-arg GOOGLE_ANALYTICS_ID=${GOOGLE_ANALYTICS_ID} \
-            --build-arg CRISP_WEBSITE_ID=${CRISP_WEBSITE_ID} \
-            --build-arg ENTERPRISE=${ENTERPRISE} \
-            --build-arg ENVIRONMENT=${ENVIRONMENT} \
-            --build-arg COMMIT_ID=$CIRCLE_SHA1 \
-            --build-arg VERSION_CODE=$(echo $CIRCLE_SHA1 | cut -c -7) \
+          extra_build_args: '--build-arg ROLLBAR_ACCESS_TOKEN=${ROLLBAR_ACCESS_TOKEN} --build-arg LANDING_HOSTNAME=${LANDING_HOSTNAME} --build-arg API_HOSTNAME=${API_HOSTNAME} --build-arg API_BASEURL=${API_BASEURL} --build-arg WEB_HOSTNAME=${WEB_HOSTNAME} --build-arg GOOGLE_ANALYTICS_ID=${GOOGLE_ANALYTICS_ID} --build-arg CRISP_WEBSITE_ID=${CRISP_WEBSITE_ID} --build-arg ENTERPRISE=${ENTERPRISE} --build-arg ENVIRONMENT=${ENVIRONMENT} --build-arg COMMIT_ID=$CIRCLE_SHA1 --build-arg VERSION_CODE=$(echo $CIRCLE_SHA1 | cut -c -7)'
           tag: 'swarm'
       - docker/push:
           digest-path: /tmp/digest.txt
@@ -109,8 +99,8 @@ jobs:
   build-api-cloud:
     executor: docker/docker
     steps:
-      - setup_remote_docker
-#          version: 20.10.18
+      - setup_remote_docker:
+          version: previous
       - checkout
       - run:
           name: Clean package-lock
@@ -120,12 +110,7 @@ jobs:
       - docker/build:
           image: thinxcloud/api
           dockerfile: ./Dockerfile
-          extra_build_args: |
-            --build-arg AQUA_SEC_TOKEN=${AQUA_SEC_TOKEN} \
-            --build-arg SNYK_TOKEN=${SNYK_TOKEN} \
-            --build-arg ENVIRONMENT=${ENVIRONMENT} \
-            --build-arg REVISION=$(git describe --abbrev=0) \
-            --build-arg ENTERPRISE=${ENTERPRISE} \
+          extra_build_args: '--build-arg AQUA_SEC_TOKEN=${AQUA_SEC_TOKEN} --build-arg SNYK_TOKEN=${SNYK_TOKEN} --build-arg ENVIRONMENT=${ENVIRONMENT} --build-arg REVISION=$(git describe --abbrev=0) --build-arg ENTERPRISE=${ENTERPRISE}'
           tag: 'latest'
       - docker/push:
           digest-path: /tmp/digest.txt
@@ -173,8 +158,8 @@ jobs:
           chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose
           docker compose version
 
-    - setup_remote_docker
-#        version: 20.10.18
+    - setup_remote_docker:
+          version: previous
 
     - checkout
 
@@ -332,8 +317,8 @@ jobs:
   sysdig:
     executor: docker/docker
     steps:
-      - setup_remote_docker
-#          version: 20.10.18
+      - setup_remote_docker:
+          version: previous
       - checkout
       - docker/check
       - run:

diff --git a/builders/arduino-docker-build b/builders/arduino-docker-build
diff --git a/builders/micropython-docker-build b/builders/micropython-docker-build
diff --git a/builders/mongoose-docker-build b/builders/mongoose-docker-build
diff --git a/builders/platformio-docker-build b/builders/platformio-docker-build
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -1,7 +1,7 @@
 version: '2.2'
 networks:
   nat:
-    external: true
+    external: false
   internal:
     external: false
 services:

diff --git a/lib/thinx/gdpr.js b/lib/thinx/gdpr.js
@@ -70,7 +70,7 @@ module.exports = class GDPR {
         var d = new Date();
         d.setMonth(d.getMonth() - month);
         d.setDate(d.getDay() - day);
-        return d;
+        return Math.floor(d.valueOf() / 1000);
     }
 
     notify24(user, _opt_callback) {
+1 −1		.circleci/config.yml
+0 −1		.cxast
+3 −3		Dockerfile
+2 −2		Dockerfile.esp32
+2 −2		Dockerfile.esp8266
+2 −3		.circleci/config.yml
+4 −2		Dockerfile
+0 −72		install.sh
+1 −1		.circleci/config.yml
+44 −19		Dockerfile
+6 −0		cross-build.sh