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

Add JLS_REPORT_OUT_OF_LICENSE env var

Browse Source 
No need of Supervisor
This commit is contained in:
CrazyMax 2018-02-16 02:02:48 +01:00
parent a19877c376
commit 0440053fa9
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,10 +1,10 @@
# Changelog # Changelog
## 15802-RC2 (2018/02/15) ## 15802-RC2 (2018/02/16)
* Add `JLS_CONTEXT` env var * Add `JLS_CONTEXT` and `JLS_REPORT_OUT_OF_LICENSE` env vars
* Timezone was not setted * Timezone was not setted
* No need of Nginx * No need of Nginx and Supervisor
* Error while saving stats * Error while saving stats
## 15802-RC1 (2018/02/01) ## 15802-RC1 (2018/02/01)

6
Dockerfile
View File

@ -15,8 +15,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.vendor="CrazyMax" \ org.label-schema.vendor="CrazyMax" \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
RUN apk --update --no-cache add \ RUN apk --update --no-cache add curl tzdata zip \
curl supervisor tzdata zip \
&& rm -rf /var/cache/apk/* /tmp/* && rm -rf /var/cache/apk/* /tmp/*
ENV JLS_PATH="/opt/jetbrains-license-server" \ ENV JLS_PATH="/opt/jetbrains-license-server" \
@ -24,7 +23,6 @@ ENV JLS_PATH="/opt/jetbrains-license-server" \
JLS_SHA256="e0030be1fd06e2db19576363a388d8b84e7b33c9d48c54f0cfcdc032ddd96181" JLS_SHA256="e0030be1fd06e2db19576363a388d8b84e7b33c9d48c54f0cfcdc032ddd96181"
ADD entrypoint.sh /entrypoint.sh ADD entrypoint.sh /entrypoint.sh
ADD assets /
RUN mkdir -p "$JLS_PATH" \ RUN mkdir -p "$JLS_PATH" \
&& curl -L "https://download.jetbrains.com/lcsrv/license-server-installer.zip" -o "/tmp/lsi.zip" \ && curl -L "https://download.jetbrains.com/lcsrv/license-server-installer.zip" -o "/tmp/lsi.zip" \
@ -39,4 +37,4 @@ EXPOSE 80
VOLUME [ "/data" ] VOLUME [ "/data" ]
ENTRYPOINT [ "/entrypoint.sh" ] ENTRYPOINT [ "/entrypoint.sh" ]
CMD [ "/usr/bin/supervisord", "-c", "/etc/supervisord.conf" ] CMD [ "/usr/local/bin/license-server", "run" ]

1
README.md
View File

@ -36,6 +36,7 @@ If you are interested, [check out](https://hub.docker.com/r/crazymax/) my other
* `JLS_CONTEXT` : [Context path](https://www.jetbrains.com/help/license_server/setting_host_and_port.html#d1010e63) used by the license server (default to : `/`) * `JLS_CONTEXT` : [Context path](https://www.jetbrains.com/help/license_server/setting_host_and_port.html#d1010e63) used by the license server (default to : `/`)
* `JLS_ACCESS_CONFIG` : JSON file to configure [user restrictions](https://www.jetbrains.com/help/license_server/configuring_user_restrictions.html) (default to `/data/access-config.json`) * `JLS_ACCESS_CONFIG` : JSON file to configure [user restrictions](https://www.jetbrains.com/help/license_server/configuring_user_restrictions.html) (default to `/data/access-config.json`)
* `JLS_STATS_RECIPIENTS` : [Reports recipients](https://www.jetbrains.com/help/license_server/detailed_server_usage_statistics.html#d461e40) email addresses for stats (comma delimited) * `JLS_STATS_RECIPIENTS` : [Reports recipients](https://www.jetbrains.com/help/license_server/detailed_server_usage_statistics.html#d461e40) email addresses for stats (comma delimited)
* `JLS_REPORT_OUT_OF_LICENSE` : [Warn about lack of licenses](https://www.jetbrains.com/help/license_server/detailed_server_usage_statistics.html#d461e40) every hour following the percentage threshold (default to : `0` = disabled)
* `JLS_SMTP_SERVER` : SMTP server host to use for sending [stats](https://www.jetbrains.com/help/license_server/detailed_server_usage_statistics.html) (stats disabled if empty) * `JLS_SMTP_SERVER` : SMTP server host to use for sending [stats](https://www.jetbrains.com/help/license_server/detailed_server_usage_statistics.html) (stats disabled if empty)
* `JLS_SMTP_PORT` : SMTP server port (default to `25`) * `JLS_SMTP_PORT` : SMTP server port (default to `25`)
* `JLS_SMTP_USERNAME` : SMTP username (auth disabled if empty) * `JLS_SMTP_USERNAME` : SMTP username (auth disabled if empty)

7
entrypoint.sh
View File

@ -14,7 +14,7 @@ echo ${TZ} > /etc/timezone
# Init # Init
echo "Initializing files and folders..." echo "Initializing files and folders..."
mkdir -p /data/registration /var/log/supervisord mkdir -p /data/registration
ln -sf "/data/registration" "/root/.jb-license-server" ln -sf "/data/registration" "/root/.jb-license-server"
touch "/data/access-config.json" touch "/data/access-config.json"
@ -54,6 +54,11 @@ if [ ! -z "$JLS_SMTP_SERVER" -a ! -z "$JLS_STATS_RECIPIENTS" ] ; then
license-server configure --stats.from ${JLS_STATS_FROM} license-server configure --stats.from ${JLS_STATS_FROM}
fi fi
if [ "$JLS_REPORT_OUT_OF_LICENSE" -gt 0 ]; then
echo "Setting report out of licence to $JLS_REPORT_OUT_OF_LICENSE%..."
license-server configure --reporting.out.of.license.threshold ${JLS_REPORT_OUT_OF_LICENSE}
fi
echo "Stats recipients: $JLS_STATS_RECIPIENTS..." echo "Stats recipients: $JLS_STATS_RECIPIENTS..."
license-server configure --stats.recipients ${JLS_STATS_RECIPIENTS} license-server configure --stats.recipients ${JLS_STATS_RECIPIENTS}
fi fi