From 8929bb071ff8f4939c06397fa4f3834422ce3b8c Mon Sep 17 00:00:00 2001 From: tycrek Date: Tue, 13 Jul 2021 18:27:23 -0600 Subject: [PATCH] added & fixed some docker scripts --- ass.js | 1 - compose.yaml | 8 +++++++- package.json | 6 +++++- utils.js | 1 + 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ass.js b/ass.js index 54f3540..9907384 100755 --- a/ass.js +++ b/ass.js @@ -98,7 +98,6 @@ log .info('Index redirect', ASS_PREMIUM.enabled && ASS_PREMIUM.index ? `enable` : 'disabled') .blank() .callback(() => { - console.log(process.argv[1]); if (process.argv[2] && process.argv[2] === '--docker-compose') log.info('docker-compose', 'Exiting in 5 seconds...') .callback(() => setTimeout(() => process.exit(0), 5000)) diff --git a/compose.yaml b/compose.yaml index fe2c99e..3a0e18c 100644 --- a/compose.yaml +++ b/compose.yaml @@ -23,4 +23,10 @@ services: source: /opt/ass/auth.json target: /opt/ass/auth.json tmpfs: /tmp - working_dir: /opt/ass \ No newline at end of file + working_dir: /opt/ass + tty: true + env_file: ./Docker.env + environment: + - NODE_ENV=production + - ASS_ENV=docker + - FORCE_COLOR=3 \ No newline at end of file diff --git a/package.json b/package.json index 16438ac..dbd77a1 100755 --- a/package.json +++ b/package.json @@ -19,7 +19,11 @@ "prestart": "npm run engine-check", "presetup": "npm run engine-check", "logs": "node ./node_modules/@tycrek/log/socketClient.js", - "docker-compose": "npm i && npm run setup && node . --docker-compose && docker-compose up -d && echo \"Check the logs to see if the server is running:\" && echo \"$ docker-compose logs -f -n 50 ass-docker\"" + "docker-compose": "npm i && npm run setup && node . --docker-compose && docker-compose up -d && echo \"Check the logs to see if the server is running:\" && echo \"$ docker logs -f -n 50 ass-docker\"", + "docker-logs": "docker logs -f -n 50 ass-docker", + "docker-stop": "docker-compose stop", + "docker-start": "docker-compose start", + "docker-restart": "docker-compose restart" }, "repository": "github:tycrek/ass", "keywords": [ diff --git a/utils.js b/utils.js index 2d850c6..f0a17e1 100755 --- a/utils.js +++ b/utils.js @@ -86,6 +86,7 @@ const logger = new TLog({ // Enable the Express logger logger + .env('ASS_ENV') //.enable.process({ uncaughtException: false }).debug('Plugin enabled', 'Process') .enable.express().debug('Plugin enabled', 'Express') .enable.socket().debug('Plugin enabled', 'Socket');