Version 1.9.0

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

CHANGELOG.md

@@ -89,3 +89,14 @@
 * 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.7.2",
+  "version": "1.9.0",
-  "upstreamVersion": "5.12",
+  "upstreamVersion": "6.1",
   "minBoxVersion": "7.1.0",
   "memoryLimit": 1073741824,
   "healthCheckPath": "/",

Dockerfile

@@ -3,7 +3,7 @@ FROM cloudron/base:4.2.0@sha256:46da2fffb36353ef714f97ae8e962bd2c212ca091108d768
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-ARG VERSION=5.12
+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 &
+(disable_registration; ensure_admin_account) &
-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",
+    "mocha": "^10.4.0",
-    "selenium-webdriver": "^4.17.0"
+    "selenium-webdriver": "^4.19.0"
   },
   "dependencies": {
-    "chromedriver": "^121.0.0"
+    "chromedriver": "^123.0.3"
   }
 }