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

Update

Browse Source
This commit is contained in:
CrazyMax 2018-02-15 22:02:49 +01:00
parent 45a1cc0557
commit 442bad00a3
4 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -3,7 +3,6 @@
## 15802-RC2 (2018/02/15) ## 15802-RC2 (2018/02/15)
* Add `JLS_CONTEXT` env var * Add `JLS_CONTEXT` env var
* Ability to set a custom UID / GID
* Timezone was not setted * Timezone was not setted
* No need of Nginx * No need of Nginx
* Error while saving stats * Error while saving stats

4
Dockerfile
View File

@ -21,9 +21,7 @@ RUN apk --update --no-cache add \
ENV JLS_PATH="/opt/jetbrains-license-server" \ ENV JLS_PATH="/opt/jetbrains-license-server" \
JLS_VERSION="15802" \ JLS_VERSION="15802" \
JLS_SHA256="e0030be1fd06e2db19576363a388d8b84e7b33c9d48c54f0cfcdc032ddd96181" \ JLS_SHA256="e0030be1fd06e2db19576363a388d8b84e7b33c9d48c54f0cfcdc032ddd96181"
USERNAME="docker" \
UID=1000 GID=1000
ADD entrypoint.sh /entrypoint.sh ADD entrypoint.sh /entrypoint.sh
ADD assets / ADD assets /

2
README.md
View File

@ -31,8 +31,6 @@ If you are interested, [check out](https://hub.docker.com/r/crazymax/) my other
### Environment variables ### Environment variables
* `UID` : License server user id (default to `1000`)
* `GID` : License server group id (default to `1000`)
* `TZ` : The timezone assigned to the container (default to `UTC`) * `TZ` : The timezone assigned to the container (default to `UTC`)
* `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 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 : `/`)

10
entrypoint.sh
View File

@ -12,17 +12,11 @@ echo "Setting timezone to ${TZ}..."
ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime
echo ${TZ} > /etc/timezone echo ${TZ} > /etc/timezone
# Create docker user
echo "Creating ${USERNAME} user and group (uid=${UID} ; gid=${GID})..."
addgroup -g ${GID} ${USERNAME}
adduser -D -s /bin/sh -G ${USERNAME} -u ${UID} ${USERNAME}
# Init # Init
echo "Initializing files and folders..." echo "Initializing files and folders..."
mkdir -p /data/registration /var/log/supervisord mkdir -p /data/registration /var/log/supervisord
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"
chown -R ${USERNAME}. /data ${JLS_PATH}
# https://www.jetbrains.com/help/license_server/setting_host_and_port.html # https://www.jetbrains.com/help/license_server/setting_host_and_port.html
echo "Configuring Jetbrains License Server..." echo "Configuring Jetbrains License Server..."
@ -70,8 +64,4 @@ if [ ! -z "$JLS_STATS_TOKEN" ] ; then
license-server configure --reporting.token ${JLS_STATS_TOKEN} license-server configure --reporting.token ${JLS_STATS_TOKEN}
fi fi
# Fix perms
echo "Fixing permissions..."
chown -R ${USERNAME}. /data ${JLS_PATH}
exec "$@" exec "$@"