diff --git a/README.md b/README.md index e962424..68724a8 100755 --- a/README.md +++ b/README.md @@ -335,7 +335,9 @@ docker-compose up -d docker-compose logs -f -n 50 ass-docker ``` -You can get your initial `ass` admin token by running `docker-compose logs -f -n 50 ass-docker` and copying the token from the output (if you ran the manual install, it will be printed with `npm start`, so copy it from there). +If you used `npm run docker-compose`, you'll have to scroll up to find your initial `ass` admin token. Look at the output of `npm start` to see find it. If you ran the manual install, it was printed when you ran `npm start`, so copy it from there. + +To view the container live logs, use `docker-compose logs -f -n 50 ass-docker`. You should now be able to access the ass server at `http://localhost:40115/` (ass-docker will bind to host `0.0.0.0` to allow external access). You can configure a reverse proxy such as [Caddy](https://jmoore.dev/tutorials/2021/03/caddy-express-reverse-proxy/) to make it accessible from the internet with automatic SSL. diff --git a/ass.js b/ass.js index fb60331..54f3540 100755 --- a/ass.js +++ b/ass.js @@ -97,4 +97,10 @@ log .info('Frontend', ASS_PREMIUM.enabled ? ASS_PREMIUM.brand : 'disabled', `${ASS_PREMIUM.enabled ? `${getTrueHttp()}${getTrueDomain()}${ASS_PREMIUM.endpoint}` : ''}`) .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)) + }) .express().Host(app, port, host, () => log.success('Ready for uploads', `Storing resources ${s3enabled ? 'in S3' : 'on disk'}`)); diff --git a/package.json b/package.json index cf51ed4..16438ac 100755 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "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 && mkdir -p /opt/ass/uploads/thumbnails && 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-compose logs -f -n 50 ass-docker\"" }, "repository": "github:tycrek/ass", "keywords": [