Version 1.9.0

when importing an external traccar with on admin, this ends up
creating an admin

CHANGELOG.md

@@ -54,3 +54,49 @@
 [1.3.0]
 * Update traccar to 5.7
 * [Full changelog](https://github.com/traccar/traccar/releases/tag/v5.7)
+
+[1.4.0]
+* Add support for Telefonika TMT250 Port 5027
+
+[1.5.0]
+* Update traccar to 5.8
+* [Full changelog](https://github.com/traccar/traccar/releases/tag/v5.8)
+
+[1.5.1]
+* Update traccar to 5.9
+* [Full changelog](https://github.com/traccar/traccar/releases/tag/v5.9)
+
+[1.6.0]
+* Update base image to 4.2.0
+
+[1.7.0]
+* Update traccar to 5.10
+* [Full changelog](https://github.com/traccar/traccar/releases/tag/v5.10)
+* [Release Announcement](https://www.traccar.org/blog/traccar-5-10/)
+* Two-factor authentication using TOTP
+* Event to notify about sent queued commands
+* Option to access last position in computed attributes
+* Unification of OBD speed units
+* Event buffer limit in the web app (should improve performance)
+* Automatic update check for the web app
+
+[1.7.1]
+* Update traccar to 5.11
+* [Full changelog](https://github.com/traccar/traccar/releases/tag/v5.11)
+* Update web submodule
+
+[1.7.2]
+* Update traccar to 5.12
+* [Full changelog](https://www.traccar.org/blog/traccar-5-12/)
+
+[1.7.3]
+* Only create admin account on fresh installation
+
+[1.8.0]
+* Update traccar to 6.0
+* [Full changelog](https://www.traccar.org/blog/traccar-6-0/)
+
+[1.9.0]
+* Update traccar to 6.1
+* [Full changelog](https://www.traccar.org/blog/traccar-6-1/)
+

CloudronManifest.json

@@ -5,8 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG.md",
   "tagline": "Modern GPS Tracking Platform",
-  "version": "1.3.0",
-  "upstreamVersion": "5.7",
+  "version": "1.9.0",
+  "upstreamVersion": "6.1",
   "minBoxVersion": "7.1.0",
   "memoryLimit": 1073741824,
   "healthCheckPath": "/",
@@ -31,27 +31,38 @@
     "OSMAND_PORT": {
       "title": "OsmAnd Port",
       "description": "Port over which OsmAnd clients can connect",
-      "defaultValue": 5055
+      "defaultValue": 5055,
+      "containerPort": 5055
     },
     "GL200_PORT": {
       "title": "GL200 Protocol Port",
       "description": "Port over which GL200 clients can connect",
-      "defaultValue": 5004
+      "defaultValue": 5004,
+      "containerPort": 5004
     },
     "GPS103_PORT": {
       "title": "GPS103 Protocol Port",
       "description": "Port over which GPS103 clients can connect",
-      "defaultValue": 5001
+      "defaultValue": 5001,
+      "containerPort": 5001
     },
     "TAIP_PORT": {
       "title": "TAIP Protocol Port",
       "description": "Port over which TAIP clients can connect",
-      "defaultValue": 5031
+      "defaultValue": 5031,
+      "containerPort": 5031
     },
     "H02_PORT": {
       "title": "H02 Protocol Port",
       "description": "Port over which H02 clients can connect",
-      "defaultValue": 5013
+      "defaultValue": 5013,
+      "containerPort": 5013
+    },
+    "TELTOKIA_PORT": {
+      "title": "Teltonika Protocol Port",
+      "description": "Port over which Teltonika clients can connect",
+      "defaultValue": 5027,
+      "containerPort": 5027
     }
   },
   "website": "https://www.traccar.org",

Dockerfile

@@ -1,9 +1,9 @@
-FROM cloudron/base:4.0.0@sha256:31b195ed0662bdb06a6e8a5ddbedb6f191ce92e8bee04c03fb02dd4e9d0286df
+FROM cloudron/base:4.2.0@sha256:46da2fffb36353ef714f97ae8e962bd2c212ca091108d768ba473078319a47f4
 
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-ARG VERSION=5.7
+ARG VERSION=6.1
 
 RUN wget https://github.com/traccar/traccar/releases/download/v${VERSION}/traccar-linux-64-${VERSION}.zip -O traccar.zip && \
     unzip traccar.zip && \

start.sh

@@ -28,7 +28,7 @@ ensure_admin_account() {
     wait_for_table tc_users;
 
     echo "==> Ensure admin account"
-    count=`$mysql --skip-column-names -s -e "SELECT COUNT(*) FROM tc_users WHERE name='admin';"`
+    count=`$mysql --skip-column-names -s -e "SELECT COUNT(*) FROM tc_users;"`
     if [[ "$count" = "0" ]]; then
         echo "==> Create initial admin account"
         # Values are from https://github.com/traccar/traccar/blob/master/schema/changelog-3.3.xml#L179 which is not used anymore, but we still want the admin account
@@ -80,8 +80,7 @@ xmlstarlet ed --inplace \
     --update '//properties/entry[@key="mail.smtp.password"]' -v "${CLOUDRON_MAIL_SMTP_PASSWORD}" \
     /app/data/traccar.xml
 
-disable_registration &
-ensure_admin_account &
+(disable_registration; ensure_admin_account) &
 
 chown -R cloudron /run/traccar /app/data
 

test/package.json

@@ -10,10 +10,10 @@
   "license": "ISC",
   "devDependencies": {
     "expect.js": "^0.3.1",
-    "mocha": "^10.2.0",
-    "selenium-webdriver": "^4.8.2"
+    "mocha": "^10.4.0",
+    "selenium-webdriver": "^4.19.0"
   },
   "dependencies": {
-    "chromedriver": "^112.0.0"
+    "chromedriver": "^123.0.3"
   }
 }

test/test.js

@@ -10,7 +10,7 @@
 
 require('chromedriver');
 
-var execSync = require('child_process').execSync,
+const execSync = require('child_process').execSync,
     expect = require('expect.js'),
     path = require('path'),
     { Builder, By, Key, until } = require('selenium-webdriver'),
@@ -34,7 +34,7 @@ describe('Application life cycle test', function () {
     const EMAIL = process.env.EMAIL;
     const PASSWORD = process.env.PASSWORD;
 
-    var browser, app;
+    let browser, app;
 
     before(function () {
         const options = new Options().windowSize({ width: 1280, height: 1024 });