diff --git a/Dockerfile b/Dockerfile index b9ef61a6507d4570641cb95e6a156500b53a0c9c..e4834c95b6580eaa91f3403627ad1a30998c3992 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,9 +54,9 @@ RUN apk add --no-cache \ COPY --from=builder /quassel/install/bin /usr/bin/ RUN addgroup -g 1000 -S quassel && \ - adduser -S -G quassel -u 1000 -s /bin/bash -h /quassel quassel + adduser -S -G quassel -u 1000 -s /bin/bash -h /config quassel USER quassel -VOLUME /quassel/ +VOLUME /config EXPOSE 4242/tcp EXPOSE 10113/tcp @@ -76,4 +76,4 @@ ENV AUTH_LDAP_BASE_DN="" ENV AUTH_LDAP_FILTER="" ENV AUTH_LDAP_UID_ATTRIBUTE="uid" -ENTRYPOINT ["quasselcore", "--configdir", "/quassel", "--config-from-environment"] +ENTRYPOINT ["quasselcore", "--configdir", "/config", "--config-from-environment"] diff --git a/README.md b/README.md index bf69af19f2ff44d12da0c51bcd41403e9f0cc45c..965c330742809f51b2741bc7a3127195bcd8d3a3 100644 --- a/README.md +++ b/README.md @@ -4,16 +4,16 @@ To use Quassel statefully (which allows you to configure the core on first use) run it with `--entrypoint=/usr/bin/quasselcore` and make sure to include -`--configdir /quassel` as argument. +`--configdir /config` as argument. -If you use the core in this mode, you’ll have to make sure `/quassel` is stored +If you use the core in this mode, you’ll have to make sure `/config` is stored on a volume. Example usage: ```bash docker run \ - -v /path/to/quassel/volume:/quassel \ + -v /path/to/quassel/volume:/config \ --entrypoint=/usr/bin/quasselcore \ k8r.eu/justjanne/quassel-docker:v0.13.1 \ --configdir /quassel @@ -40,7 +40,7 @@ Minimal example with SQLite: ```bash docker run \ - -v /path/to/quassel/volume:/quassel \ + -v /path/to/quassel/volume:/config \ -e DB_BACKEND=SQLite \ -e AUTH_AUTHENTICATOR=Database \ k8r.eu/justjanne/quassel-docker:v0.13.1 @@ -74,7 +74,7 @@ docker run \ You can use the core with SSL, in this case you should either put a `quasselCert.pem` file with the full certificate chain and private key into -the `/quassel` volume, or you can use the `--ssl-cert` and `--ssl-key` +the `/config` volume, or you can use the `--ssl-cert` and `--ssl-key` arguments to use separate key and certificate. ## Ports