Fix shell script

CHANGELOG.md

@@ -30,3 +30,24 @@
 [1.0.1]
 * Add GPS103 port 5001
 
+[1.0.2]
+* Add TAIP port 5031
+
+[1.0.3]
+* Update traccar to 5.4
+* [Full changelog](https://github.com/traccar/traccar/releases/tag/v5.4)
+
+[1.1.0]
+* Update traccar to 5.5
+* [Full changelog](https://github.com/traccar/traccar/releases/tag/v5.5)
+
+[1.2.0]
+* Update base image to 4.0.0
+
+[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)
+

CloudronManifest.json

@@ -3,10 +3,10 @@
   "title": "Traccar",
   "author": "Traccar developers",
   "description": "file://DESCRIPTION.md",
-  "changelog": "file://CHANGELOG",
+  "changelog": "file://CHANGELOG.md",
   "tagline": "Modern GPS Tracking Platform",
-  "version": "1.0.1",
-  "upstreamVersion": "5.3",
+  "version": "1.2.2",
+  "upstreamVersion": "5.6",
   "minBoxVersion": "7.1.0",
   "memoryLimit": 1073741824,
   "healthCheckPath": "/",
@@ -42,6 +42,16 @@
       "title": "GPS103 Protocol Port",
       "description": "Port over which GPS103 clients can connect",
       "defaultValue": 5001
+    },
+    "TAIP_PORT": {
+      "title": "TAIP Protocol Port",
+      "description": "Port over which TAIP clients can connect",
+      "defaultValue": 5031
+    },
+    "H02_PORT": {
+      "title": "H02 Protocol Port",
+      "description": "Port over which H02 clients can connect",
+      "defaultValue": 5013
     }
   },
   "website": "https://www.traccar.org",

Dockerfile

@@ -1,9 +1,9 @@
-FROM cloudron/base:3.2.0@sha256:ba1d566164a67c266782545ea9809dc611c4152e27686fd14060332dd88263ea
+FROM cloudron/base:4.0.0@sha256:31b195ed0662bdb06a6e8a5ddbedb6f191ce92e8bee04c03fb02dd4e9d0286df
 
 RUN mkdir -p /app/code
 WORKDIR /app/code
 
-ARG VERSION=5.3
+ARG VERSION=5.6
 
 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.json

@@ -10,10 +10,10 @@
   "license": "ISC",
   "devDependencies": {
     "expect.js": "^0.3.1",
-    "mocha": "^10.0.0",
-    "selenium-webdriver": "^4.3.1"
+    "mocha": "^10.2.0",
+    "selenium-webdriver": "^4.8.0"
   },
   "dependencies": {
-    "chromedriver": "^103.0.0"
+    "chromedriver": "^110.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;