Upgrade to JetBrains License Server 17955

.dockerignore

@@ -0,0 +1,13 @@
+/.dev
+/.idea
+/*.iml
+
+/.git
+/.res
+/examples
+/.editorconfig
+/.gitignore
+/.travis.yml
+/CHANGELOG.md
+/LICENSE
+/README.md

.travis.yml

@@ -5,7 +5,7 @@ services:
 
 env:
   global:
-    - VERSION=17211
+    - VERSION=17955
     - GITHUB_REPO=crazy-max/docker-jetbrains-license-server
     - DOCKER_USERNAME=crazymax
     - DOCKER_REPONAME=jetbrains-license-server
@@ -29,7 +29,7 @@ install:
     docker build --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
     --build-arg VCS_REF=${TRAVIS_COMMIT::8} \
     --build-arg VERSION=${VERSION} \
-    -t $DOCKER_USERNAME/$DOCKER_REPONAME -f ./docker/Dockerfile ./docker
+    -t $DOCKER_USERNAME/$DOCKER_REPONAME .
 
 before_script:
   - docker run -d -p 8000:80 -e JLS_VIRTUAL_HOSTS=$WAN_IP --name $DOCKER_REPONAME $DOCKER_USERNAME/$DOCKER_REPONAME
@@ -40,15 +40,16 @@ script:
   - docker ps | grep $DOCKER_REPONAME
 
 after_success:
-  - test $TRAVIS_PULL_REQUEST = false
-    && echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
-    && docker tag $DOCKER_USERNAME/$DOCKER_REPONAME $DOCKER_USERNAME/$DOCKER_REPONAME:$DOCKER_TAG
-    && docker tag $DOCKER_USERNAME/$DOCKER_REPONAME $DOCKER_USERNAME/$DOCKER_REPONAME:$VERSION
-    && docker push $DOCKER_USERNAME/$DOCKER_REPONAME
-    && echo "$QUAY_PASSWORD" | docker login quay.io --username "$QUAY_USERNAME" --password-stdin
-    && docker tag $DOCKER_USERNAME/$DOCKER_REPONAME quay.io/$DOCKER_USERNAME/$DOCKER_REPONAME:$DOCKER_TAG
-    && docker tag $DOCKER_USERNAME/$DOCKER_REPONAME quay.io/$DOCKER_USERNAME/$DOCKER_REPONAME:$VERSION
-    && docker push quay.io/$QUAY_USERNAME/$QUAY_REPONAME
+  - |
+    test $TRAVIS_PULL_REQUEST = false \
+    && echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin \
+    && docker tag $DOCKER_USERNAME/$DOCKER_REPONAME $DOCKER_USERNAME/$DOCKER_REPONAME:$DOCKER_TAG \
+    && docker tag $DOCKER_USERNAME/$DOCKER_REPONAME $DOCKER_USERNAME/$DOCKER_REPONAME:$VERSION \
+    && docker push $DOCKER_USERNAME/$DOCKER_REPONAME \
+    && echo "$QUAY_PASSWORD" | docker login quay.io --username "$QUAY_USERNAME" --password-stdin \
+    && docker tag $DOCKER_USERNAME/$DOCKER_REPONAME quay.io/$DOCKER_USERNAME/$DOCKER_REPONAME:$DOCKER_TAG \
+    && docker tag $DOCKER_USERNAME/$DOCKER_REPONAME quay.io/$DOCKER_USERNAME/$DOCKER_REPONAME:$VERSION \
+    && docker push quay.io/$QUAY_USERNAME/$QUAY_REPONAME \
     && curl -X POST $MICROBADGER_HOOK
 
 branches:

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 17955-RC1 (2018/09/26)
+
+* Upgrade to JetBrains License Server 17955
+
+## 17768-RC1 (2018/09/05)
+
+* Upgrade to JetBrains License Server 17768
+
+## 17437-RC1 (2018/07/30)
+
+* Upgrade to JetBrains License Server 17437
+
 ## 17211-RC1 (2018/06/29)
 
 * Upgrade to JetBrains License Server 17211

Dockerfile

@@ -1,11 +1,11 @@
 FROM openjdk:8-jre-alpine
-MAINTAINER CrazyMax <crazy-max@users.noreply.github.com>
 
 ARG BUILD_DATE
 ARG VCS_REF
 ARG VERSION
 
-LABEL org.label-schema.build-date=$BUILD_DATE \
+LABEL maintainer="CrazyMax" \
+  org.label-schema.build-date=$BUILD_DATE \
   org.label-schema.name="jetbrains-license-server" \
   org.label-schema.description="JetBrains License Server image based on Alpine Linux" \
   org.label-schema.version=$VERSION \
@@ -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="17955" \
+  JLS_SHA256="998422a48b2d568e5baafd683f9f52b54e2274a0f526afd367a8b84e81b9ec70"
 
 ADD entrypoint.sh /entrypoint.sh
 

README.md

@@ -50,9 +50,11 @@ If you are interested, [check out](https://hub.docker.com/r/crazymax/) my other
 
 * `80` : Jetbrains License Server HTTP port
 
-## Usage
+## Use this image
 
-Docker compose is the recommended way to run this image. You can use the following [docker compose template](docker/docker-compose.yml), then run the container :
+### Docker Compose
+
+Docker compose is the recommended way to run this image. Copy the content of folder [examples/compose](examples/compose) in `/var/jls/` on your host for example. Edit the compose and env files with your preferences and run the following commands :
 
 ```bash
 touch acme.json
@@ -61,7 +63,9 @@ docker-compose up -d
 docker-compose logs -f
 ```
 
-Or use the following minimal command :
+### Command line
+
+You can also use the following minimal command :
 
 ```bash
 $ docker run -d -p 8000:80 --name jetbrains-license-server \
@@ -94,9 +98,9 @@ Passed value of header "Host" is not allowed. Please contact your license server
 
 That's because the license server is running behind a reverse proxy. Please configure virtual hosts using the `JLS_VIRTUAL_HOSTS` variable.
 
-## How can i help ?
+## How can I help ?
 
-All kinds of contributions are welcomed :raised_hands:!<br />
+All kinds of contributions are welcome :raised_hands:!<br />
 The most basic way to show your support is to star :star2: the project, or to raise issues :speech_balloon:<br />
 But we're not gonna lie to each other, I'd rather you buy me a beer or two :beers:!
 

docker/.dockerignore

@@ -1 +0,0 @@
-/docker-compose.yml

docker/docker-compose.yml

@@ -1,62 +0,0 @@
-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
-    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
-    restart: always
-
-  app:
-    image: crazymax/jetbrains-license-server:latest
-    depends_on:
-      - traefik
-    volumes:
-      - 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
-    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
-    restart: always
-
-volumes:
-  jetbrains-license-server:

examples/compose/docker-compose.yml

@@ -0,0 +1,61 @@
+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"
+    ports:
+      - target: 80
+        published: 80
+        protocol: tcp
+      - target: 443
+        published: 443
+        protocol: tcp
+    volumes:
+      - "./acme.json:/acme.json"
+      - "/var/run/docker.sock:/var/run/docker.sock"
+    restart: always
+
+  app:
+    image: crazymax/jetbrains-license-server:latest
+    depends_on:
+      - traefik
+    volumes:
+      - "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"
+    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=0123456789ABCDEF"
+    restart: always
+
+volumes:
+  jetbrains-license-server: