From 442bad00a3a2497127483974304eafd63fa88d9d Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Thu, 15 Feb 2018 22:02:49 +0100
Subject: [PATCH] Update

---
 CHANGELOG.md  |  1 -
 Dockerfile    |  4 +---
 README.md     |  2 --
 entrypoint.sh | 10 ----------
 4 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83d215b..59d043b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,6 @@
 ## 15802-RC2 (2018/02/15)
 
 * Add `JLS_CONTEXT` env var
-* Ability to set a custom UID / GID
 * Timezone was not setted
 * No need of Nginx
 * Error while saving stats
diff --git a/Dockerfile b/Dockerfile
index 0fe4a08..c2aa4c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,9 +21,7 @@ RUN apk --update --no-cache add \
 
 ENV JLS_PATH="/opt/jetbrains-license-server" \
   JLS_VERSION="15802" \
-  JLS_SHA256="e0030be1fd06e2db19576363a388d8b84e7b33c9d48c54f0cfcdc032ddd96181" \
-  USERNAME="docker" \
-  UID=1000 GID=1000
+  JLS_SHA256="e0030be1fd06e2db19576363a388d8b84e7b33c9d48c54f0cfcdc032ddd96181"
 
 ADD entrypoint.sh /entrypoint.sh
 ADD assets /
diff --git a/README.md b/README.md
index d8e7fb9..836f000 100644
--- a/README.md
+++ b/README.md
@@ -31,8 +31,6 @@ If you are interested, [check out](https://hub.docker.com/r/crazymax/) my other
 
 ### 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`)
 * `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 : `/`)
diff --git a/entrypoint.sh b/entrypoint.sh
index c49bb7e..c5df7aa 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -12,17 +12,11 @@ echo "Setting timezone to ${TZ}..."
 ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime
 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
 echo "Initializing files and folders..."
 mkdir -p /data/registration /var/log/supervisord
 ln -sf "/data/registration" "/root/.jb-license-server"
 touch "/data/access-config.json"
-chown -R ${USERNAME}. /data ${JLS_PATH}
 
 # https://www.jetbrains.com/help/license_server/setting_host_and_port.html
 echo "Configuring Jetbrains License Server..."
@@ -70,8 +64,4 @@ if [ ! -z "$JLS_STATS_TOKEN" ] ; then
   license-server configure --reporting.token ${JLS_STATS_TOKEN}
 fi
 
-# Fix perms
-echo "Fixing permissions..."
-chown -R ${USERNAME}. /data ${JLS_PATH}
-
 exec "$@"