From ac739e60cfb6c488aab1d8e89cbcf1454f50fc54 Mon Sep 17 00:00:00 2001
From: CrazyMax <crazy-max@users.noreply.github.com>
Date: Mon, 30 Jul 2018 16:17:47 +0200
Subject: [PATCH] Upgrade to JetBrains License Server 17437

---
 CHANGELOG.md                        |  4 ++
 Dockerfile                          |  4 +-
 examples/compose/docker-compose.yml | 72 ++++++++++++++---------------
 3 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77d5c49..ed21a38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 17437-RC1 (2018/07/30)
+
+* Upgrade to JetBrains License Server 17437
+
 ## 17211-RC1 (2018/06/29)
 
 * Upgrade to JetBrains License Server 17211
diff --git a/Dockerfile b/Dockerfile
index b72e9f3..e5fadb1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,8 +19,8 @@ RUN apk --update --no-cache add tzdata \
   && rm -rf /var/cache/apk/* /tmp/*
 
 ENV JLS_PATH="/opt/jetbrains-license-server" \
-  JLS_VERSION="17211" \
-  JLS_SHA256="d935f4607cd281135b141773dfc188ff253ac5932b16ee288787036e8693dd41"
+  JLS_VERSION="17437" \
+  JLS_SHA256="9f15c63e9f40e2bf399b503d77a53ad3e4ff5deefb5d8bf29fad6d281b4be4ca"
 
 ADD entrypoint.sh /entrypoint.sh
 
diff --git a/examples/compose/docker-compose.yml b/examples/compose/docker-compose.yml
index 685ca7a..6b3b489 100644
--- a/examples/compose/docker-compose.yml
+++ b/examples/compose/docker-compose.yml
@@ -1,36 +1,34 @@
-version: '3.2'
+version: "3.2"
 
 services:
   traefik:
     image: traefik:1.6-alpine
     command:
-      - --logLevel=INFO
-      - --defaultentrypoints=http,https
-      - --entryPoints=Name:http Address::80 Redirect.EntryPoint:https
-      - --entryPoints=Name:https Address::443 TLS
-      - --docker
-      - --docker.exposedbydefault=false
-      - --docker.domain=example.com
-      - --acme=false
-      - --acme.acmelogging=true
-      - --acme.email=webmaster@example.com
-      - --acme.storage=acme.json
-      - --acme.entryPoint=https
-      - --acme.onhostrule=true
-      - --acme.httpchallenge=true
-      - --acme.httpchallenge.entrypoint=http
+      - "--logLevel=INFO"
+      - "--defaultentrypoints=http,https"
+      - "--entryPoints=Name:http Address::80 Redirect.EntryPoint:https"
+      - "--entryPoints=Name:https Address::443 TLS"
+      - "--docker"
+      - "--docker.exposedbydefault=false"
+      - "--docker.domain=example.com"
+      - "--acme=false"
+      - "--acme.acmelogging=true"
+      - "--acme.email=webmaster@example.com"
+      - "--acme.storage=acme.json"
+      - "--acme.entryPoint=https"
+      - "--acme.onhostrule=true"
+      - "--acme.httpchallenge=true"
+      - "--acme.httpchallenge.entrypoint=http"
     ports:
       - target: 80
         published: 80
         protocol: tcp
-        mode: host
       - target: 443
         published: 443
         protocol: tcp
-        mode: host
     volumes:
-      - ./acme.json:/acme.json
-      - /var/run/docker.sock:/var/run/docker.sock
+      - "./acme.json:/acme.json"
+      - "/var/run/docker.sock:/var/run/docker.sock"
     restart: always
 
   app:
@@ -38,25 +36,25 @@ services:
     depends_on:
       - traefik
     volumes:
-      - jetbrains-license-server:/data
+      - "jetbrains-license-server:/data"
     labels:
-      - traefik.enable=true
-      - traefik.backend=jetbrains-license-server
-      - traefik.port=80
-      - traefik.frontend.rule=Host:jetbrains-license-server.example.com,an-other-host.example.com
+      - "traefik.enable=true"
+      - "traefik.backend=jetbrains-license-server"
+      - "traefik.port=80"
+      - "traefik.frontend.rule=Host:jetbrains-license-server.example.com,an-other-host.example.com"
     environment:
-      - TZ=Europe/Paris
-      - JLS_VIRTUAL_HOSTS=jetbrains-license-server.example.com,an-other-host.example.com
-      - JLS_CONTEXT=/
-      - JLS_ACCESS_CONFIG=/data/access-config.json
-      - JLS_STATS_RECIPIENTS=webmaster@example.com,an-other-address@example.com
-      - JLS_REPORT_OUT_OF_LICENSE=90
-      - JLS_SMTP_SERVER=smtp.example.com
-      - JLS_SMTP_PORT=25
-      - JLS_SMTP_USERNAME=smtp@example.com
-      - JLS_SMTP_PASSWORD=
-      - JLS_STATS_FROM=jetbrains@example.com
-      - JLS_STATS_TOKEN=1BFC67F51AAF99E85C2347B72E62C
+      - "TZ=Europe/Paris"
+      - "JLS_VIRTUAL_HOSTS=jetbrains-license-server.example.com,an-other-host.example.com"
+      - "JLS_CONTEXT=/"
+      - "JLS_ACCESS_CONFIG=/data/access-config.json"
+      - "JLS_STATS_RECIPIENTS=webmaster@example.com,an-other-address@example.com"
+      - "JLS_REPORT_OUT_OF_LICENSE=90"
+      - "JLS_SMTP_SERVER=smtp.example.com"
+      - "JLS_SMTP_PORT=25"
+      - "JLS_SMTP_USERNAME=smtp@example.com"
+      - "JLS_SMTP_PASSWORD="
+      - "JLS_STATS_FROM=jetbrains@example.com"
+      - "JLS_STATS_TOKEN=1BFC67F51AAF99E85C2347B72E62C"
     restart: always
 
 volumes: