diff --git a/lsio/mastodon/docker-compose.yaml b/lsio/mastodon/docker-compose.yaml index de798f6..2cb5317 100644 --- a/lsio/mastodon/docker-compose.yaml +++ b/lsio/mastodon/docker-compose.yaml @@ -71,6 +71,16 @@ services: - AWS_SECRET_ACCESS_KEY= # optional # Alternate hostname for object fetching if you are front the S3 connections. - S3_ALIAS_HOST= # optional + # Only run the sidekiq service in this container instance. For large scale instances that need better queue handling. + - SIDEKIQ_ONLY=false # optional + # The name of the sidekiq queue to run in this container. See [notes](https://docs.joinmastodon.org/admin/scaling/#sidekiq-queues). + - SIDEKIQ_QUEUE= # optional + # Set to `true` on the main container if you're running additional sidekiq instances. It will run the `default` queue. + - SIDEKIQ_DEFAULT=false # optional + # The number of threads for sidekiq to use. See [notes](https://docs.joinmastodon.org/admin/scaling/#sidekiq-threads). + - SIDEKIQ_THREADS=5 # optional + # The size of the DB connection pool, must be *at least* the same as `SIDEKIQ_THREADS`. See [notes](https://docs.joinmastodon.org/admin/scaling/#sidekiq-threads). + - DB_POOL=5 # optional volumes: # Contains all relevant configuration files. - ${BASEDIR:-/volume1/docker}/mastodon/config:/config diff --git a/lsio/mastodon/docker-run.sh b/lsio/mastodon/docker-run.sh index 9deaf68..7629e75 100644 --- a/lsio/mastodon/docker-run.sh +++ b/lsio/mastodon/docker-run.sh @@ -36,6 +36,11 @@ docker run -d \ -e AWS_ACCESS_KEY_ID= `# optional` `# S3 bucket access key ID` \ -e AWS_SECRET_ACCESS_KEY= `# optional` `# S3 bucket secret access key` \ -e S3_ALIAS_HOST= `# optional` `# Alternate hostname for object fetching if you are front the S3 connections.` \ + -e SIDEKIQ_ONLY=false `# optional` `# Only run the sidekiq service in this container instance. For large scale instances that need better queue handling.` \ + -e SIDEKIQ_QUEUE= `# optional` `# The name of the sidekiq queue to run in this container. See [notes](https://docs.joinmastodon.org/admin/scaling/#sidekiq-queues).` \ + -e SIDEKIQ_DEFAULT=false `# optional` `# Set to `true` on the main container if you're running additional sidekiq instances. It will run the `default` queue.` \ + -e SIDEKIQ_THREADS=5 `# optional` `# The number of threads for sidekiq to use. See [notes](https://docs.joinmastodon.org/admin/scaling/#sidekiq-threads).` \ + -e DB_POOL=5 `# optional` `# The size of the DB connection pool, must be *at least* the same as `SIDEKIQ_THREADS`. See [notes](https://docs.joinmastodon.org/admin/scaling/#sidekiq-threads).` \ -p 80:80 `# Port for web frontend` \ -p 443:443 `# Port for web frontend` \ -v ${BASEDIR:-/volume1/docker}/mastodon/config:/config `# Contains all relevant configuration files.` \ diff --git a/lsio/snipe-it/docker-compose.yaml b/lsio/snipe-it/docker-compose.yaml index 77a6fa1..a137e7c 100644 --- a/lsio/snipe-it/docker-compose.yaml +++ b/lsio/snipe-it/docker-compose.yaml @@ -17,15 +17,15 @@ services: # Hostname or IP and port if applicable, be sure to define https/http - APP_URL=http://localhost:8080 # Mysql hostname or IP to use - - MYSQL_PORT_3306_TCP_ADDR= + - MYSQL_PORT_3306_TCP_ADDR= # Mysql port to use - - MYSQL_PORT_3306_TCP_PORT= + - MYSQL_PORT_3306_TCP_PORT= # Mysql database to use - - MYSQL_DATABASE= + - MYSQL_DATABASE= # Mysql user to use - - MYSQL_USER= + - MYSQL_USER= # Mysql password to use - - MYSQL_PASSWORD=changeme + - MYSQL_PASSWORD= # Specify a timezone to use for example Europe/Amsterdam - TZ=${TZ:-Europe/Amsterdam} volumes: diff --git a/lsio/snipe-it/docker-run.sh b/lsio/snipe-it/docker-run.sh index 414a7b6..4791e6f 100644 --- a/lsio/snipe-it/docker-run.sh +++ b/lsio/snipe-it/docker-run.sh @@ -9,11 +9,11 @@ docker run -d \ -e PUID=${PUID:-1024} `# for UserID` \ -e PGID=${PGID:-100} `# for GroupID` \ -e APP_URL=http://localhost:8080 `# Hostname or IP and port if applicable, be sure to define https/http` \ - -e MYSQL_PORT_3306_TCP_ADDR= `# Mysql hostname or IP to use` \ - -e MYSQL_PORT_3306_TCP_PORT= `# Mysql port to use` \ - -e MYSQL_DATABASE= `# Mysql database to use` \ - -e MYSQL_USER= `# Mysql user to use` \ - -e MYSQL_PASSWORD=changeme `# Mysql password to use` \ + -e MYSQL_PORT_3306_TCP_ADDR= `# Mysql hostname or IP to use` \ + -e MYSQL_PORT_3306_TCP_PORT= `# Mysql port to use` \ + -e MYSQL_DATABASE= `# Mysql database to use` \ + -e MYSQL_USER= `# Mysql user to use` \ + -e MYSQL_PASSWORD= `# Mysql password to use` \ -e TZ=${TZ:-Europe/Amsterdam} `# Specify a timezone to use for example Europe/Amsterdam` \ -p 8080:80 `# Snipe-IT Web UI` \ -v ${BASEDIR:-/volume1/docker}/snipe-it/config:/config `# Contains your config files and data storage for Snipe-IT` \