Skip to content
Snippets Groups Projects
Verified Commit 00e6c0b3 authored by Louis's avatar Louis :fire:
Browse files

Merge branch 'develop' into feature/Classification

parents 08492502 e3e8e6e8
No related branches found
No related tags found
No related merge requests found
...@@ -15,10 +15,10 @@ type: application ...@@ -15,10 +15,10 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes # This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version. # to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/) # Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.3.0 version: 0.3.1
# This is the version number of the application being deployed. This version number should be # This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to # incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using. # follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes. # It is recommended to use it with quotes.
appVersion: "2.2.0" appVersion: "2.2.4"
{ {
"name": "jetsam-api", "name": "jetsam-api",
"version": "2.2.2", "version": "2.2.3",
"description": "The Jetsam App API Server", "description": "The Jetsam App API Server",
"main": "server.js", "main": "server.js",
"scripts": { "scripts": {
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
"watch:queue": "NODE_PATH=src QUEUE_ACTION=consumer DEBUG=server:* nodemon worker --ignore './client/src' --ignore './certs' --ignore 'google-storage.json'", "watch:queue": "NODE_PATH=src QUEUE_ACTION=consumer DEBUG=server:* nodemon worker --ignore './client/src' --ignore './certs' --ignore 'google-storage.json'",
"exec:env": "docker-compose -p jetenv up", "exec:env": "docker-compose -p jetenv up",
"exec:ngrok": "ngrok http 7124 --hostname trash.4l2.uk", "exec:ngrok": "ngrok http 7124 --hostname trash.4l2.uk",
"exec:check_img": "NODE_PATH=src node scripts/exec-boot 'node scripts/check_img.js'",
"test": "NODE_ENV=testing NODE_PATH=src node scripts/jest.js", "test": "NODE_ENV=testing NODE_PATH=src node scripts/jest.js",
"start": "NODE_PATH=src node server", "start": "NODE_PATH=src node server",
"cmd": "NODE_PATH=src node run", "cmd": "NODE_PATH=src node run",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment