JetBrains License Server 20308

Alpine Linux 3.10

.editorconfig

@@ -3,14 +3,11 @@ root = true
 
 [*]
 indent_style = space
-indent_size = 4
+indent_size = 2
 end_of_line = lf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[{Dockerfile,*.sh,*.yml}]
-indent_size = 2
-
 [*.md]
 trim_trailing_whitespace = false

.gitattributes

@@ -0,0 +1 @@
+/*.sh linguist-detectable=false

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+patreon: crazymax
+custom: https://www.paypal.me/crazyws

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,39 @@
+---
+name: Bug report
+about: Create a report to help us improve
+---
+
+### Behaviour
+
+#### Steps to reproduce this issue
+
+1.
+2.
+3.
+
+#### Expected behaviour
+
+> Tell me what should happen
+
+#### Actual behaviour
+
+> Tell me what happens instead
+
+### Configuration
+
+* Docker version (type `docker --version`) :
+* Docker compose version if applicable (type `docker-compose --version`) : 
+* Platform (Debian 9, Ubuntu 18.04, ...) : 
+* Include all necessary configuration files : `docker-compose.yml`, `.env`, ...
+
+### Docker info
+
+```
+> Output of command `docker info`
+```
+
+### Logs
+
+```
+> Container logs (set LOG_LEVEL to debug if applicable)
+```

.github/SUPPORT.md

@@ -0,0 +1,30 @@
+# Support [![](https://isitmaintained.com/badge/resolution/crazy-max/docker-jetbrains-license-server.svg)](https://isitmaintained.com/project/crazy-max/docker-jetbrains-license-server)
+
+## Reporting an issue
+
+Please do a search in [open issues](https://github.com/crazy-max/docker-jetbrains-license-server/issues?utf8=%E2%9C%93&q=) to see if the issue or feature request has already been filed.
+
+If you find your issue already exists, make relevant comments and add your [reaction](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments). Use a reaction in place of a "+1" comment.
+
+:+1: - upvote
+
+:-1: - downvote
+
+If you cannot find an existing issue that describes your bug or feature, submit an issue using the guidelines below.
+
+## Writing good bug reports and feature requests
+
+File a single issue per problem and feature request.
+
+* Do not enumerate multiple bugs or feature requests in the same issue.
+* Do not add your issue as a comment to an existing issue unless it's for the identical input. Many issues look similar, but have different causes.
+
+The more information you can provide, the more likely someone will be successful reproducing the issue and finding a fix.
+
+You are now ready to [create a new issue](https://github.com/crazy-max/docker-jetbrains-license-server/issues/new/choose)!
+
+## Closure policy
+
+* Support directly related to JetBrains License Server will not be provided if your problem is not related to the operation of this image.
+* Issues that don't have the information requested above (when applicable) will be closed immediately and the poster directed to the support guidelines.
+* Issues that go a week without a response from original poster are subject to closure at my discretion.

.travis.yml

@@ -5,14 +5,13 @@ services:
 
 env:
   global:
-    - VERSION=18692
+    - VERSION=20308
     - DOCKER_LOGIN=crazymax
     - DOCKER_USERNAME=crazymax
     - DOCKER_REPONAME=jetbrains-license-server
     - QUAY_LOGIN=crazymax
     - QUAY_USERNAME=crazymax
     - QUAY_REPONAME=jetbrains-license-server
-    - MICROBADGER_HOOK=https://hooks.microbadger.com/images/crazymax/jetbrains-license-server/PWF7sHnaK1djP4E9r5VY5suUqVk=
     - secure: JwfXiiIM4c6E+80O6XHQBhw6IdkerfGxlKo+YHvmtkHyz5Fvpc1ZRvWSZYHZhxE1gocThbKUCy4GsgIyiq+dsER27kdAnnvp6JLw8SZ5OSqtOOLjqCKilN2hwFaS/g6Xc3mGvTo+4ScAc9CDJamDCwGY+6r2g/+IdmCbgqOo8yaD4VkhP4eVB3f4el6F7jEwjo626QDzFZ1LVS0qmmeVBSU+xxfL5HolG+j//hLQ/49XIIGnsWtQmHbX1u2trSESyNRTFdY/KZ7qaW8l+BgLhplKu+YXAExb1POGcKJnffSJjCl22ggX1JUHANMgrcQfZe2DKkUJFqr8FvTCktj+lfAuMYwl3k24zcZHe8eTyBFh8YLs7pn++tOFWg0XcKCWO9vzHgbTf/m95F6tpDMx4Y49jRclJIslxkjf8YIuNvDOO4kPKp2bw4ymqjsayPLx3P4xB8vgvyAZeFBQevUkh3ia/3uCfwEwzWimlT1FTeDUj8h4A9y+zRy/AqGf35LneC/Sbwt5dNaCujAwOGFeCvTp43uYd10S5Rz026ecH/8XlcHzuH4+nUvXDnesRI79+6NkaKl8PdcTx0ZC44jIAULn60rur5ybNkQmv5GWjem1C24izosPuC8bLHYY6BSRPn+vacNZH9SYTw2wHiVunxZORWz4FsYAidFkoaygt9E= # DOCKER_PASSWORD
     - secure: Z+SIP2bLs70GcInLxGdYv68vXD47RIfowafFP8KpVt7EHki6AsIVJxrEH4/noj0jsx0Zyi93xAo+Z9Ms+BDsjUKeLjODS/mHjRQBrnryenjAnS8cRVvJUUDYcoY95SIOO4j6OSEIb+aI2d+6T2QX/iEgnEFDjiia2mLJ60orsWDtgoU7dgITB7ci4WkSMZl8VXtX7SUWKgVPRKkapfYX/AFUS41MZTnJvGQHCtTYlOMcS7fsf6ahjMvbTmf+otv2n688Mbg8Tz3cEw6YD5BHemfDq5qEJqjjnCtMIr5VSZttDwKwHsgmHrVEoiPq+Cdo+xwq3XCdfKu/qAD7NalBjNVaf6UjLjhkk4CWwLxQFnon1e8EC8GodXob4jQTGVOQX47lkPCvf6zM14GI1YxGMtofkv5ND7Ul/g+9fsn+b/QJFsuQb3ZA34pufjQQ5HRaj0ZU7izXIpUOu5EVo5ffrmUnrTisVNaSuIUonEt0p1WPFhdr1ScUc/VukF+wapDdSrSu/t8a5MXp0q3nZ+20NHlkm90o8umQqS8U1oo/n1hlEWTpC4PtRd4wggz0YNGTIKLpuxUt8HolU9rSPbGcbMLC53bNxnWd9KFaaFmRj5Np1GsBm2CDAPFYb3n/Dqyww+tg9Nk4MnCLMwROyZ+5Y7UQLtG5Tsh9tCtwPtT7Juk= # QUAY_PASSWORD
 
@@ -23,5 +22,8 @@ before_install:
 script: ./build.sh
 
 notifications:
-  webhooks:
-    secure: aSAfpOXZ2sZF4lR+e0Pi8O1/ePVft0wwSQm6L2nugmk+bIkZO/iC+SaNTK1rbbiba/zEjSmxvtA+3Sx+Sw9eOPZaP3sm6PvaVycukmZeUeVMlDUDDiV1xKshAisYuheVSO4kvRFzqoSo/IwClukHbGtYO9bquxgfy+Nan5wkzx0rzFDNsSChDbAEcnZKXxSrXSlOYVtY1fRcBTq52BwnBJzE4+6zDDNJz47sJY3dhAToodOpg+LkiX6b8kY8iAtEf25HKGrJ+O7mGLJOrtZmHLBQXAhcMHLNGtajuP3xZe/1Nq/rezRzbD/Tv7breXoIABnHR6y7oGf2Iry46Uzeg758AEYNU4FymD2sDz1zF1362OFBDq50pZm/MG2K4YqrKcWoy+TzCm4+H/XzsXG1jootRj2vsy1/QFL6zI/vVk6ZsN2ISSEFrJ2T/SZZWHxhYihGemfaSLoLZ0o316KrJxmzj37YucYjJYY/b+iAQruAFPJLd3vtanHfTaFQdUiXJdU7rrolESKI1zg/1cx5rV8PrnUZJXrSNATXgoyXsEvDRsdekHg8w+6ml6OenhgrNoJYG1c+GFtCf/cUaKe9bw6WniiqXtgw75Tdz0BqzNTu9BibhnDdeKYFBzT6wgsBRs47fgWcnmy++CryMvWymTdiiDnTaljUGB/rikA9QTk=
+  email:
+    recipients:
+      - travisci@crazymax.dev
+    on_success: always
+    on_failure: always

CHANGELOG.md

@@ -1,28 +1,53 @@
 # Changelog
 
+## 20308-RC1 (2019/07/30)
+
+* JetBrains License Server 20308
+
+## 20267-RC2 (2019/07/22)
+
+* OpenJDK JRE 12
+* Alpine Linux 3.10
+
+## 20267-RC1 (2019/07/19)
+
+* JetBrains License Server 20267
+
+## 19488-RC1 (2019/04/02)
+
+* JetBrains License Server 19488
+
+## 19340-RC1 (2019/03/15)
+
+* JetBrains License Server 19340
+
+## 18692-RC2 (2019/01/22)
+
+* Bind to unprivileged port : `8000`
+
 ## 18692-RC1 (2018/12/25)
 
-* Upgrade to JetBrains License Server 18692
+* JetBrains License Server 18692
 
 ## 17955-RC1 (2018/09/26)
 
-* Upgrade to JetBrains License Server 17955
+* JetBrains License Server 17955
 
 ## 17768-RC1 (2018/09/05)
 
-* Upgrade to JetBrains License Server 17768
+* JetBrains License Server 17768
 
 ## 17437-RC1 (2018/07/30)
 
-* Upgrade to JetBrains License Server 17437
+* JetBrains License Server 17437
 
 ## 17211-RC1 (2018/06/29)
 
-* Upgrade to JetBrains License Server 17211
+* JetBrains License Server 17211
 
 ## 17043-RC1 (2018/05/31)
 
-* Upgrade to JetBrains License Server 17043
+* JetBrains License Server 17043
 
 ## 16429-RC2 (2018/04/20)
 
@@ -30,12 +55,12 @@
 
 ## 16743-RC1 (2018/04/20)
 
-* Upgrade to JetBrains License Server 16743
+* JetBrains License Server 16743
 * Replace Nginx + Let's Encrypt with Traefik (see docker-compose)
 
 ## 16429-RC1 (2018/03/20)
 
-* Upgrade to JetBrains License Server 16429
+* JetBrains License Server 16429
 
 ## 15802-RC2 (2018/02/16)
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM openjdk:8-jre-alpine
+FROM adoptopenjdk/openjdk12:alpine-jre
 
 ARG BUILD_DATE
 ARG VCS_REF
@@ -16,15 +16,16 @@ LABEL maintainer="CrazyMax" \
   org.label-schema.schema-version="1.0"
 
 ENV JLS_PATH="/opt/jetbrains-license-server" \
-  JLS_VERSION="18692" \
-  JLS_SHA256="e71c4abae7d144dda7af5775dd6812e93d5934de39134d97420b4b0db29e16f4"
+  JLS_VERSION="20308" \
+  JLS_SHA256="15cd436d41b1af8e273b8f8b037d654a9e9d9ca8a5f188e08426ca1024ba143a"
 
 COPY entrypoint.sh /entrypoint.sh
 
 RUN apk --update --no-cache add \
     tzdata \
   && apk --update --no-cache add -t build-dependencies \
-    curl zip \
+    curl \
+    zip \
   && mkdir -p "$JLS_PATH" \
   && curl -L "https://download.jetbrains.com/lcsrv/license-server-installer.zip" -o "/tmp/jls.zip" \
   && echo "$JLS_SHA256  /tmp/jls.zip" | sha256sum -c - | grep OK \
@@ -36,7 +37,7 @@ RUN apk --update --no-cache add \
   && apk del build-dependencies \
   && rm -rf /var/cache/apk/* /tmp/*
 
-EXPOSE 80
+EXPOSE 8000
 VOLUME [ "/data" ]
 
 ENTRYPOINT [ "/entrypoint.sh" ]

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 CrazyMax
+Copyright (c) 2018-2019 CrazyMax
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,13 +1,14 @@
 <p align="center"><a href="https://github.com/crazy-max/docker-jetbrains-license-server" target="_blank"><img height="128"src="https://raw.githubusercontent.com/crazy-max/docker-jetbrains-license-server/master/.res/docker-jetbrains-license-server.jpg"></a></p>
 
 <p align="center">
-  <a href="https://microbadger.com/images/crazymax/jetbrains-license-server"><img src="https://images.microbadger.com/badges/version/crazymax/jetbrains-license-server.svg?style=flat-square" alt="Version"></a>
-  <a href="https://travis-ci.org/crazy-max/docker-jetbrains-license-server"><img src="https://img.shields.io/travis/crazy-max/docker-jetbrains-license-server/master.svg?style=flat-square" alt="Build Status"></a>
+  <a href="https://hub.docker.com/r/crazymax/jetbrains-license-server/"><img src="https://img.shields.io/badge/dynamic/json.svg?label=version&query=$.results[1].name&url=https://hub.docker.com/v2/repositories/crazymax/jetbrains-license-server/tags&style=flat-square" alt="Latest Version"></a>
+  <a href="https://travis-ci.com/crazy-max/docker-jetbrains-license-server"><img src="https://img.shields.io/travis/com/crazy-max/docker-jetbrains-license-server/master.svg?style=flat-square" alt="Build Status"></a>
   <a href="https://hub.docker.com/r/crazymax/jetbrains-license-server/"><img src="https://img.shields.io/docker/stars/crazymax/jetbrains-license-server.svg?style=flat-square" alt="Docker Stars"></a>
   <a href="https://hub.docker.com/r/crazymax/jetbrains-license-server/"><img src="https://img.shields.io/docker/pulls/crazymax/jetbrains-license-server.svg?style=flat-square" alt="Docker Pulls"></a>
   <a href="https://quay.io/repository/crazymax/jetbrains-license-server"><img src="https://quay.io/repository/crazymax/jetbrains-license-server/status?style=flat-square" alt="Docker Repository on Quay"></a>
   <a href="https://www.codacy.com/app/crazy-max/docker-jetbrains-license-server"><img src="https://img.shields.io/codacy/grade/eb420bc3e6ed49ff97cc261602228efa.svg?style=flat-square" alt="Code Quality"></a>
-  <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3BXL8EBDJALHQ"><img src="https://img.shields.io/badge/donate-paypal-7057ff.svg?style=flat-square" alt="Donate Paypal"></a>
+  <br /><a href="https://www.patreon.com/crazymax"><img src="https://img.shields.io/badge/donate-patreon-fb664e.svg?style=flat-square" alt="Support me on Patreon"></a>
+  <a href="https://www.paypal.me/crazyws"><img src="https://img.shields.io/badge/donate-paypal-7057ff.svg?style=flat-square" alt="Donate Paypal"></a>
 </p>
 
 ## About
@@ -49,7 +50,7 @@ If you are interested, [check out](https://hub.docker.com/r/crazymax/) my other
 
 ### Ports
 
-* `80` : Jetbrains License Server HTTP port
+* `8000` : Jetbrains License Server HTTP port
 
 ## Use this image
 
@@ -69,7 +70,7 @@ docker-compose logs -f
 You can also use the following minimal command :
 
 ```bash
-$ docker run -d -p 8000:80 --name jetbrains-license-server \
+$ docker run -d -p 8000:8000 --name jetbrains_license_server \
   -e TZ="Europe/Paris" \
   -e JLS_VIRTUAL_HOSTS=jetbrains-license-server.example.com \
   -v $(pwd)/data:/data \
@@ -105,7 +106,8 @@ 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:!
 
-[![Paypal](.res/paypal.png)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=3BXL8EBDJALHQ)
+[![Support me on Patreon](.res/patreon.png)](https://www.patreon.com/crazymax) 
+[![Paypal Donate](.res/paypal.png)](https://www.paypal.me/crazyws)
 
 ## License
 

build.sh

@@ -4,17 +4,19 @@ set -e
 PROJECT=jetbrains-license-server
 BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
 BUILD_TAG=docker_build
-VCS_REF=${TRAVIS_COMMIT::8}
+BUILD_WORKINGDIR=${BUILD_WORKINGDIR:-.}
+DOCKERFILE=${DOCKERFILE:-Dockerfile}
+VCS_REF=${TRAVIS_COMMIT::7}
 RUNNING_TIMEOUT=120
 RUNNING_LOG_CHECK="is listening on"
 
 PUSH_LATEST=${PUSH_LATEST:-true}
-DOCKER_USERNAME=${DOCKER_USERNAME:="crazymax"}
-DOCKER_LOGIN=${DOCKER_LOGIN:="crazymax"}
-DOCKER_REPONAME=${DOCKER_REPONAME:="jetbrains-license-server"}
-QUAY_USERNAME=${QUAY_USERNAME:="crazymax"}
-QUAY_LOGIN=${QUAY_LOGIN:="crazymax"}
-QUAY_REPONAME=${QUAY_REPONAME:="jetbrains-license-server"}
+DOCKER_USERNAME=${DOCKER_USERNAME:-crazymax}
+DOCKER_LOGIN=${DOCKER_LOGIN:-crazymax}
+DOCKER_REPONAME=${DOCKER_REPONAME:-jetbrains-license-server}
+QUAY_USERNAME=${QUAY_USERNAME:-crazymax}
+QUAY_LOGIN=${QUAY_LOGIN:-crazymax}
+QUAY_REPONAME=${QUAY_REPONAME:-jetbrains-license-server}
 
 # Check local or travis
 BRANCH=${TRAVIS_BRANCH:-local}
@@ -33,6 +35,8 @@ echo "PROJECT=${PROJECT}"
 echo "VERSION=${VERSION}"
 echo "BUILD_DATE=${BUILD_DATE}"
 echo "BUILD_TAG=${BUILD_TAG}"
+echo "BUILD_WORKINGDIR=${BUILD_WORKINGDIR}"
+echo "DOCKERFILE=${DOCKERFILE}"
 echo "VCS_REF=${VCS_REF}"
 echo "PUSH_LATEST=${PUSH_LATEST}"
 echo "DOCKER_LOGIN=${DOCKER_LOGIN}"
@@ -53,12 +57,12 @@ docker build \
   --build-arg BUILD_DATE=${BUILD_DATE} \
   --build-arg VCS_REF=${VCS_REF} \
   --build-arg VERSION=${VERSION} \
-  -t ${BUILD_TAG} .
+  -t ${BUILD_TAG} -f ${DOCKERFILE} ${BUILD_WORKINGDIR}
 echo
 
 echo "### Test"
-docker rm -f ${PROJECT} || true
-docker run -d -p 8000:80 \
+docker rm -f ${PROJECT} > /dev/null 2>&1 || true
+docker run -d -p 8000:8000 \
   -e "JLS_VIRTUAL_HOSTS=docker.test" \
   --name ${PROJECT} ${BUILD_TAG}
 echo
@@ -77,9 +81,16 @@ while read LOGLINE; do
     exit 1
   fi
 done < <(docker logs -f ${PROJECT} 2>&1)
-docker rm -f ${PROJECT} > /dev/null 2>&1 || true
 echo
 
+CONTAINER_STATUS=$(docker container inspect --format "{{.State.Status}}" ${PROJECT})
+if [[ ${CONTAINER_STATUS} != "running" ]]; then
+  >&2 echo "ERROR: Container ${PROJECT} returned status '$CONTAINER_STATUS'"
+  docker rm -f ${PROJECT} > /dev/null 2>&1 || true
+  exit 1
+fi
+docker rm -f ${PROJECT} > /dev/null 2>&1 || true
+
 if [ "${VERSION}" == "local" -o "${TRAVIS_PULL_REQUEST}" == "true" ]; then
   echo "INFO: This is a PR or a local build, skipping push..."
   exit 0
@@ -94,11 +105,6 @@ if [[ ! -z ${DOCKER_PASSWORD} ]]; then
     docker tag ${BUILD_TAG} ${DOCKER_USERNAME}/${DOCKER_REPONAME}:${VERSION}
   fi
   docker push ${DOCKER_USERNAME}/${DOCKER_REPONAME}
-  if [[ ! -z ${MICROBADGER_HOOK} ]]; then
-    echo "Call MicroBadger hook"
-    curl -X POST ${MICROBADGER_HOOK}
-    echo
-  fi
   echo
 fi
 if [[ ! -z ${QUAY_PASSWORD} ]]; then

entrypoint.sh

@@ -3,7 +3,7 @@
 TZ=${TZ:-UTC}
 JLS_PATH="/opt/jetbrains-license-server"
 JLS_LISTEN_ADDRESS="0.0.0.0"
-JLS_PORT=80
+JLS_PORT=8000
 JLS_CONTEXT=${JLS_CONTEXT:-/}
 JLS_ACCESS_CONFIG=${JLS_ACCESS_CONFIG:-/data/access-config.json}
 

examples/compose/docker-compose.yml

@@ -2,7 +2,8 @@ version: "3.2"
 
 services:
   traefik:
-    image: traefik:1.6-alpine
+    image: traefik:1.7-alpine
+    container_name: traefik
     command:
       - "--logLevel=INFO"
       - "--defaultentrypoints=http,https"
@@ -33,6 +34,7 @@ services:
 
   app:
     image: crazymax/jetbrains-license-server:latest
+    container_name: jetbrains_license_server
     depends_on:
       - traefik
     volumes:
@@ -40,7 +42,7 @@ services:
     labels:
       - "traefik.enable=true"
       - "traefik.backend=jetbrains-license-server"
-      - "traefik.port=80"
+      - "traefik.port=8000"
       - "traefik.frontend.rule=Host:jetbrains-license-server.example.com,an-other-host.example.com"
     environment:
       - "TZ=Europe/Paris"