sombochea/docker-jetbrains-license-server
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Proxy type defaults to https

Browse Source 
More unset
This commit is contained in:
CrazyMax 2019-11-28 18:28:07 +01:00
parent 737f2bd964
commit 6f91dbf64c
No known key found for this signature in database
GPG Key ID: 3248E46B6BB8C7F7
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.md
View File

@ -1,5 +1,10 @@
# Changelog # Changelog
## 21137-RC4 (2019/11/28)
* Proxy type defaults to `https`
* More unset
## 21137-RC3 (2019/11/28) ## 21137-RC3 (2019/11/28)
* Add env vars to set proxy settings (#21) * Add env vars to set proxy settings (#21)

6
README.md
View File

@ -45,11 +45,11 @@ Image: crazymax/jetbrains-license-server:latest
### Environment variables ### Environment variables
* `TZ`: The timezone assigned to the container (default `UTC`) * `TZ`: The timezone assigned to the container (default `UTC`)
* `PUID`: Process UID (default `1000`) * `PUID`: JLS UID (default `1000`)
* `PGID`: Process GID (default `1000`) * `PGID`: JLS GID (default `1000`)
* `JLS_VIRTUAL_HOSTS`: [Virtual hosts](https://www.jetbrains.com/help/license_server/setting_host_and_port.html#d1010e63) where license server will be available (comma delimited for several hosts) * `JLS_VIRTUAL_HOSTS`: [Virtual hosts](https://www.jetbrains.com/help/license_server/setting_host_and_port.html#d1010e63) where license server will be available (comma delimited for several hosts)
* `JLS_CONTEXT`: [Context path](https://www.jetbrains.com/help/license_server/setting_host_and_port.html#d1010e63) used by the license server (default `/`) * `JLS_CONTEXT`: [Context path](https://www.jetbrains.com/help/license_server/setting_host_and_port.html#d1010e63) used by the license server (default `/`)
* `JLS_PROXY_TYPE`: Type of [proxy](https://www.jetbrains.com/help/license_server/configuring_proxy_settings.html) to use. Can be `http` or `https` (default `http`) * `JLS_PROXY_TYPE`: Type of [proxy](https://www.jetbrains.com/help/license_server/configuring_proxy_settings.html) to use. Can be `http` or `https` (default `https`)
* `JLS_PROXY_HOST`: The host name of your proxy server * `JLS_PROXY_HOST`: The host name of your proxy server
* `JLS_PROXY_PORT`: The port number that the proxy server listens to * `JLS_PROXY_PORT`: The port number that the proxy server listens to
* `JLS_PROXY_USER`: Username to connect to the proxy server (no auth if empty) * `JLS_PROXY_USER`: Username to connect to the proxy server (no auth if empty)

8
entrypoint.sh
View File

@ -5,7 +5,7 @@ JLS_LISTEN_ADDRESS="0.0.0.0"
JLS_PORT=8000 JLS_PORT=8000
JLS_CONTEXT=${JLS_CONTEXT:-/} JLS_CONTEXT=${JLS_CONTEXT:-/}
JLS_ACCESS_CONFIG=${JLS_ACCESS_CONFIG:-/data/access-config.json} JLS_ACCESS_CONFIG=${JLS_ACCESS_CONFIG:-/data/access-config.json}
JLS_PROXY_TYPE=${JLS_PROXY_TYPE:-http} JLS_PROXY_TYPE=${JLS_PROXY_TYPE:-https}
if [ -n "${PGID}" ] && [ "${PGID}" != "$(id -g jls)" ]; then if [ -n "${PGID}" ] && [ "${PGID}" != "$(id -g jls)" ]; then
echo "Switching to PGID ${PGID}..." echo "Switching to PGID ${PGID}..."
@ -46,10 +46,10 @@ if [ ! -z "$JLS_PROXY_HOST" -a ! -z "$JLS_PROXY_PORT" ]; then
su-exec jls:jls license-server configure \ su-exec jls:jls license-server configure \
-J-D${JLS_PROXY_TYPE}.proxyUser=${JLS_PROXY_USER} \ -J-D${JLS_PROXY_TYPE}.proxyUser=${JLS_PROXY_USER} \
-J-D${JLS_PROXY_TYPE}.proxyPassword=${JLS_PROXY_PASSWORD} -J-D${JLS_PROXY_TYPE}.proxyPassword=${JLS_PROXY_PASSWORD}
unset JLS_PROXY_USER
unset JLS_PROXY_PASSWORD
fi fi
fi fi
unset JLS_PROXY_USER
unset JLS_PROXY_PASSWORD
# https://www.jetbrains.com/help/license_server/configuring_user_restrictions.html # https://www.jetbrains.com/help/license_server/configuring_user_restrictions.html
if [ -s "$JLS_ACCESS_CONFIG" ]; then if [ -s "$JLS_ACCESS_CONFIG" ]; then
@ -68,6 +68,8 @@ if [ ! -z "$JLS_SMTP_SERVER" -a ! -z "$JLS_STATS_RECIPIENTS" ]; then
su-exec jls:jls license-server configure --smtp.server.username ${JLS_SMTP_USERNAME} su-exec jls:jls license-server configure --smtp.server.username ${JLS_SMTP_USERNAME}
su-exec jls:jls license-server configure --smtp.server.password ${JLS_SMTP_PASSWORD} su-exec jls:jls license-server configure --smtp.server.password ${JLS_SMTP_PASSWORD}
fi fi
unset JLS_SMTP_USERNAME
unset JLS_SMTP_PASSWORD
if [ ! -z "$JLS_STATS_FROM" ]; then if [ ! -z "$JLS_STATS_FROM" ]; then
echo "Setting stats sender to $JLS_STATS_FROM..." echo "Setting stats sender to $JLS_STATS_FROM..."