Version 1.3.0

CHANGELOG.md

@@ -47,3 +47,10 @@
 [1.2.1]
 * Add H02 port 5013
 
+[1.2.2]
+* Update traccar to 5.6
+* [Full changelog](https://github.com/traccar/traccar/releases/tag/v5.6)
+
+[1.3.0]
+* Update traccar to 5.7
+* [Full changelog](https://github.com/traccar/traccar/releases/tag/v5.7)

CloudronManifest.json

@@ -5,8 +5,8 @@
   "description": "file://DESCRIPTION.md",
   "changelog": "file://CHANGELOG.md",
   "tagline": "Modern GPS Tracking Platform",
-  "version": "1.2.1",
-  "upstreamVersion": "5.5",
+  "version": "1.3.0",
+  "upstreamVersion": "5.7",
   "minBoxVersion": "7.1.0",
   "memoryLimit": 1073741824,
   "healthCheckPath": "/",

Dockerfile

@@ -3,7 +3,7 @@ FROM cloudron/base:4.0.0@sha256:31b195ed0662bdb06a6e8a5ddbedb6f191ce92e8bee04c03
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-ARG VERSION=5.5
+ARG VERSION=5.7
 
 RUN wget https://github.com/traccar/traccar/releases/download/v${VERSION}/traccar-linux-64-${VERSION}.zip -O traccar.zip && \
     unzip traccar.zip && \

POSTINSTALL.md

@@ -1,7 +1,6 @@
 This app is pre-setup with an admin account. The initial credentials are:
 
-**Username**: admin<br/>
+**Username**: admin@cloudron.local<br/>
 **Password**: admin<br/>
 
 Please change the admin email and password credentials immediately.
-

start.sh

@@ -7,16 +7,38 @@ mkdir -p /run/traccar/logs /app/data/media
 echo -e "[client]\npassword=${CLOUDRON_MYSQL_PASSWORD}" > /run/traccar/mysql-extra
 readonly mysql="mysql --defaults-file=/run/traccar/mysql-extra --user=${CLOUDRON_MYSQL_USERNAME} --host=${CLOUDRON_MYSQL_HOST} -P ${CLOUDRON_MYSQL_PORT} ${CLOUDRON_MYSQL_DATABASE}"
 
+wait_for_table() {
+    ret=`$mysql --skip-column-names -s -e "SHOW TABLES LIKE '$1';"`
+    while [ "$ret" != "$1" ]; do
+        echo "=> Table $1 not yet created, waiting ..."
+        sleep 1;
+        ret=`$mysql --skip-column-names -s -e "SHOW TABLES LIKE '$1';"`
+        echo "ret was ${ret}"
+    done
+}
+
 disable_registration() {
-    sleep 10
-    echo "==> disabling registration"
+    wait_for_table tc_servers;
+
+    echo "==> Disabling registration"
     $mysql -e "UPDATE tc_servers SET registration=0 WHERE id=1"
 }
 
+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';"`
+    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
+        $mysql -e "INSERT INTO tc_users (name, email, hashedpassword, salt, administrator) VALUES ('admin', 'admin@cloudron.local', 'D33DCA55ABD4CC5BC76F2BC0B4E603FE2C6F61F4C1EF2D47', '000000000000000000000000000000000000000000000000', TRUE)"
+    fi
+}
+
 echo "=> Ensure traccar.xml config"
 if [[ ! -f /app/data/traccar.xml ]]; then
     cp /app/pkg/traccar.xml.template /app/data/traccar.xml
-    disable_registration &
 fi
 
 echo "=> Ensure database settings"
@@ -58,6 +80,9 @@ xmlstarlet ed --inplace \
     --update '//properties/entry[@key="mail.smtp.password"]' -v "${CLOUDRON_MAIL_SMTP_PASSWORD}" \
     /app/data/traccar.xml
 
+disable_registration &
+ensure_admin_account &
+
 chown -R cloudron /run/traccar /app/data
 
 # https://www.traccar.org/optimization/

test/package-lock.json

@@ -9,12 +9,12 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "chromedriver": "^109.0.0"
+        "chromedriver": "^112.0.0"
       },
       "devDependencies": {
         "expect.js": "^0.3.1",
         "mocha": "^10.2.0",
-        "selenium-webdriver": "^4.7.1"
+        "selenium-webdriver": "^4.8.2"
       }
     },
     "node_modules/@testim/chrome-version": {
@@ -234,9 +234,9 @@
       }
     },
     "node_modules/chromedriver": {
-      "version": "109.0.0",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-109.0.0.tgz",
-      "integrity": "sha512-jdmBq11IUwfThLFiygGTZ89qbROSQI4bICQjvOVQy2Bqr1LwC+MFkhwyZp3YG99eehQbZuTlQmmfCZBfpewTNA==",
+      "version": "112.0.0",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-112.0.0.tgz",
+      "integrity": "sha512-fEw1tI05dmK1KK8MGh99LAppP7zCOPEXUxxbYX5wpIBCCmKasyrwZhk/qsdnxJYKd/h0TfiHvGEj7ReDQXW1AA==",
       "hasInstallScript": true,
       "dependencies": {
         "@testim/chrome-version": "^1.1.3",
@@ -1103,14 +1103,14 @@
       ]
     },
     "node_modules/selenium-webdriver": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.7.1.tgz",
-      "integrity": "sha512-IfTM9OE8HtCKjOJwyudbAVtAHQKOJK8mu2qrXXbKyj4lqgXF+2lYW4rSZXCV6SLQRWZ+DVGkomCmFzq5orD/ZA==",
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.8.2.tgz",
+      "integrity": "sha512-d2dcpDLPcXlBy5qcPtB1B8RYTtj1N+JiHQLViFx3OP+i5hqkAuqTfJEYUh4qNX11S4NvbxjteiwN3OPwK3vPVw==",
       "dev": true,
       "dependencies": {
         "jszip": "^3.10.0",
         "tmp": "^0.2.1",
-        "ws": ">=8.7.0"
+        "ws": ">=8.11.0"
       },
       "engines": {
         "node": ">= 14.20.0"
@@ -1283,16 +1283,16 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "node_modules/ws": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz",
-      "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz",
+      "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
       },
       "peerDependencies": {
         "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "utf-8-validate": ">=5.0.2"
       },
       "peerDependenciesMeta": {
         "bufferutil": {
@@ -1543,9 +1543,9 @@
       }
     },
     "chromedriver": {
-      "version": "109.0.0",
-      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-109.0.0.tgz",
-      "integrity": "sha512-jdmBq11IUwfThLFiygGTZ89qbROSQI4bICQjvOVQy2Bqr1LwC+MFkhwyZp3YG99eehQbZuTlQmmfCZBfpewTNA==",
+      "version": "112.0.0",
+      "resolved": "https://registry.npmjs.org/chromedriver/-/chromedriver-112.0.0.tgz",
+      "integrity": "sha512-fEw1tI05dmK1KK8MGh99LAppP7zCOPEXUxxbYX5wpIBCCmKasyrwZhk/qsdnxJYKd/h0TfiHvGEj7ReDQXW1AA==",
       "requires": {
         "@testim/chrome-version": "^1.1.3",
         "axios": "^1.2.1",
@@ -2176,14 +2176,14 @@
       "dev": true
     },
     "selenium-webdriver": {
-      "version": "4.7.1",
-      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.7.1.tgz",
-      "integrity": "sha512-IfTM9OE8HtCKjOJwyudbAVtAHQKOJK8mu2qrXXbKyj4lqgXF+2lYW4rSZXCV6SLQRWZ+DVGkomCmFzq5orD/ZA==",
+      "version": "4.8.2",
+      "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-4.8.2.tgz",
+      "integrity": "sha512-d2dcpDLPcXlBy5qcPtB1B8RYTtj1N+JiHQLViFx3OP+i5hqkAuqTfJEYUh4qNX11S4NvbxjteiwN3OPwK3vPVw==",
       "dev": true,
       "requires": {
         "jszip": "^3.10.0",
         "tmp": "^0.2.1",
-        "ws": ">=8.7.0"
+        "ws": ">=8.11.0"
       }
     },
     "serialize-javascript": {
@@ -2319,9 +2319,9 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "ws": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.8.0.tgz",
-      "integrity": "sha512-JDAgSYQ1ksuwqfChJusw1LSJ8BizJ2e/vVu5Lxjq3YvNJNlROv1ui4i+c/kUUrPheBvQl4c5UbERhTwKa6QBJQ==",
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.12.0.tgz",
+      "integrity": "sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==",
       "dev": true,
       "requires": {}
     },

test/package.json

@@ -11,9 +11,9 @@
   "devDependencies": {
     "expect.js": "^0.3.1",
     "mocha": "^10.2.0",
-    "selenium-webdriver": "^4.7.1"
+    "selenium-webdriver": "^4.8.2"
   },
   "dependencies": {
-    "chromedriver": "^109.0.0"
+    "chromedriver": "^112.0.0"
   }
 }

test/test.js

@@ -27,10 +27,12 @@ describe('Application life cycle test', function () {
     const LOCATION = 'test';
     const TEST_TIMEOUT = 10000;
     const EXEC_ARGS = { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' };
-    const ADMIN_USERNAME = 'admin'; // the login form is called email but accepts usernames
-    const ADMIN_PASSWORD = 'admin';
     const DEVICE_NAME = 'FancyDevice';
     const DEVICE_IDENTIFIER = 'device1';
+    const ADMIN_USERNAME = 'admin@cloudron.local';
+    const ADMIN_PASSWORD = 'admin';
+    const EMAIL = process.env.EMAIL;
+    const PASSWORD = process.env.PASSWORD;
 
     var browser, app;