Skip to content

Commit

Permalink
Improve Docker no-auth mode.
Browse files Browse the repository at this point in the history
Remove use of environment variable, instruct users to run a specific
command instead.
  • Loading branch information
ralight committed Mar 3, 2021
1 parent 1103c83 commit 5c45bc4
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 26 deletions.
8 changes: 3 additions & 5 deletions docker/2.0-openssl/README.md
Expand Up @@ -25,12 +25,10 @@ context of a container, this means you would normally need to provide a
configuration file with your settings.

If you wish to run mosquitto without any authentication, and without setting
any other configuration options, you can do so by setting an environment
variable when creating the container: `NO_AUTHENTICATION=1`. Doing this will
ignore any configuration file you provide.

any other configuration options, you can do so by using a configuration
provided in the container for this purpose:
```
docker run -it -p 1883:1883 -e NO_AUTHENTICATION=1 eclipse-mosquitto:<version>
docker run -it -p 1883:1883 eclipse-mosquitto:<version> mosquitto -c /mosquitto-no-auth.conf
```

## Configuration
Expand Down
9 changes: 1 addition & 8 deletions docker/2.0-openssl/docker-entrypoint.sh
Expand Up @@ -7,11 +7,4 @@ if [ "$user" = '0' ]; then
[ -d "/mosquitto" ] && chown -R mosquitto:mosquitto /mosquitto || true
fi

if [ "$NO_AUTHENTICATION" = "1" ] && [ "$*" = '/usr/sbin/mosquitto -c /mosquitto/config/mosquitto.conf' ]; then
# The user wants to run Mosquitto with no authentication, but without
# providing a configuration file. Use the pre-provided file for this.
exec /usr/sbin/mosquitto -c /mosquitto-no-auth.conf
else
# Execute whatever command is requested
exec "$@"
fi
exec "$@"
8 changes: 3 additions & 5 deletions docker/2.0/README.md
Expand Up @@ -25,12 +25,10 @@ context of a container, this means you would normally need to provide a
configuration file with your settings.

If you wish to run mosquitto without any authentication, and without setting
any other configuration options, you can do so by setting an environment
variable when creating the container: `NO_AUTHENTICATION=1`. Doing this will
ignore any configuration file you provide.

any other configuration options, you can do so by using a configuration
provided in the container for this purpose:
```
docker run -it -p 1883:1883 -e NO_AUTHENTICATION=1 eclipse-mosquitto:<version>
docker run -it -p 1883:1883 eclipse-mosquitto:<version> mosquitto -c /mosquitto-no-auth.conf
```

## Configuration
Expand Down
9 changes: 1 addition & 8 deletions docker/2.0/docker-entrypoint.sh
Expand Up @@ -7,11 +7,4 @@ if [ "$user" = '0' ]; then
[ -d "/mosquitto" ] && chown -R mosquitto:mosquitto /mosquitto || true
fi

if [ "$NO_AUTHENTICATION" = "1" ] && [ "$*" = '/usr/sbin/mosquitto -c /mosquitto/config/mosquitto.conf' ]; then
# The user wants to run Mosquitto with no authentication, but without
# providing a configuration file. Use the pre-provided file for this.
exec /usr/sbin/mosquitto -c /mosquitto-no-auth.conf
else
# Execute whatever command is requested
exec "$@"
fi
exec "$@"

0 comments on commit 5c45bc4

Please sign in to comment.