Optimize layers

Stop publishing Docker image on Quay

.dockerignore

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

.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.

.github/workflows/build.yml

@@ -0,0 +1,78 @@
+name: build
+
+on:
+  pull_request:
+    branches: 'master'
+  push:
+    branches: 'master'
+    tags: '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Prepare
+        id: prepare
+        run: |
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            TAG=${GITHUB_REF#refs/tags/}
+            echo ::set-output name=tag_name::${TAG}
+            echo ::set-output name=version::${TAG%-*}
+          else
+            echo ::set-output name=version::snapshot
+          fi
+          echo ::set-output name=build_date::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+          echo ::set-output name=docker_platforms::linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
+          echo ::set-output name=docker_username::crazymax
+          echo ::set-output name=docker_image::crazymax/jetbrains-license-server
+      -
+        # https://github.com/crazy-max/ghaction-docker-buildx
+        name: Set up Docker Buildx
+        uses: crazy-max/ghaction-docker-buildx@v1
+        with:
+          version: latest
+      -
+        # https://github.com/actions/checkout
+        name: Checkout
+        uses: actions/checkout@v1
+      -
+        name: Docker Buildx (no push)
+        run: |
+          docker buildx build --platform ${{ steps.prepare.outputs.docker_platforms }} \
+            --output "type=image,push=false" \
+            --label "org.label-schema.build-date=${{ steps.prepare.outputs.build_date }}" \
+            --label "org.label-schema.version=${{ steps.prepare.outputs.version }}" \
+            --label "org.label-schema.vcs-ref=${GITHUB_SHA::8}" \
+            --tag "${{ steps.prepare.outputs.docker_image }}:latest" \
+            --tag "${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}" \
+            --file Dockerfile .
+      -
+        name: Docker Login
+        if: success() && startsWith(github.ref, 'refs/tags/')
+        env:
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: |
+          echo "${DOCKER_PASSWORD}" | docker login --username "${{ steps.prepare.outputs.docker_username }}" --password-stdin
+      -
+        name: Docker Buildx (push)
+        if: success() && startsWith(github.ref, 'refs/tags/')
+        run: |
+          docker buildx build --platform ${{ steps.prepare.outputs.docker_platforms }} \
+            --output "type=image,push=true" \
+            --label "org.label-schema.build-date=${{ steps.prepare.outputs.build_date }}" \
+            --label "org.label-schema.version=${{ steps.prepare.outputs.version }}" \
+            --label "org.label-schema.vcs-ref=${GITHUB_SHA::8}" \
+            --tag "${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}" \
+            --tag "${{ steps.prepare.outputs.docker_image }}:latest" \
+            --file Dockerfile .
+      -
+        name: Docker Check Manifest
+        if: always() && startsWith(github.ref, 'refs/tags/')
+        run: |
+          docker run --rm mplatform/mquery ${{ steps.prepare.outputs.docker_image }}:${{ steps.prepare.outputs.version }}
+      -
+        name: Clear
+        if: always() && startsWith(github.ref, 'refs/tags/')
+        run: |
+          rm -f ${HOME}/.docker/config.json

.github/workflows/test.yml

@@ -0,0 +1,66 @@
+name: test
+
+on:
+  pull_request:
+    branches: master
+  push:
+    branches: master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Prepare
+        id: prepare
+        run: |
+          echo ::set-output name=build_tag::test
+          echo ::set-output name=container_name::jetbrains-license-server
+          echo ::set-output name=running_timeout::120
+          echo ::set-output name=running_log_check::is listening on
+      -
+        # https://github.com/actions/checkout
+        name: Checkout
+        uses: actions/checkout@v1
+      -
+        # https://github.com/crazy-max/ghaction-docker-buildx
+        name: Set up Docker Buildx
+        uses: crazy-max/ghaction-docker-buildx@v1
+        with:
+          version: latest
+      -
+        name: Docker Buildx
+        run: |
+          docker buildx build --load --tag ${{ steps.prepare.outputs.build_tag }} --file Dockerfile .
+      -
+        name: Start container
+        run: |
+          docker rm -f ${{ steps.prepare.outputs.container_name }} > /dev/null 2>&1 || true
+          docker run -d --name ${{ steps.prepare.outputs.container_name }} \
+            -e "JLS_VIRTUAL_HOSTS=docker.test" \
+            ${{ steps.prepare.outputs.build_tag }}
+      -
+        name: Test run
+        run: |
+          TIMEOUT=$((SECONDS + ${{ steps.prepare.outputs.running_timeout }}))
+          while read LOGLINE; do
+            echo ${LOGLINE}
+            if [[ ${LOGLINE} == *"${{ steps.prepare.outputs.running_log_check }}"* ]]; then
+              echo "🎉 Container up!"
+              break
+            fi
+            if [[ $SECONDS -gt ${TIMEOUT} ]]; then
+              >&2 echo "❌ Failed to run ${{ steps.prepare.outputs.container_name }} container"
+              docker rm -f ${{ steps.prepare.outputs.container_name }} > /dev/null 2>&1 || true
+              exit 1
+            fi
+          done < <(docker logs -f ${{ steps.prepare.outputs.container_name }} 2>&1)
+
+          CONTAINER_STATUS=$(docker container inspect --format "{{.State.Status}}" ${{ steps.prepare.outputs.container_name }})
+          if [[ ${CONTAINER_STATUS} != "running" ]]; then
+            >&2 echo "❌ Container ${{ steps.prepare.outputs.container_name }} returned status '$CONTAINER_STATUS'"
+            docker rm -f ${{ steps.prepare.outputs.container_name }} > /dev/null 2>&1 || true
+            exit 1
+          fi
+          docker rm -f ${{ steps.prepare.outputs.container_name }} > /dev/null 2>&1 || true
+          echo

.travis.yml

@@ -1,68 +0,0 @@
-sudo: required
-
-services:
-  - docker
-
-env:
-  global:
-    - VERSION=16743
-    - GITHUB_REPO=crazy-max/docker-jetbrains-license-server
-    - DOCKER_USERNAME=crazymax
-    - DOCKER_REPONAME=jetbrains-license-server
-    - QUAY_USERNAME=crazymax
-    - QUAY_REPONAME=jetbrains-license-server
-    - DOCKER_VERSION=17.12.0~ce-0~ubuntu
-    - COMPOSE_VERSION=1.18.0
-    - 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
-    - secure: CRv5ONsqQ7WPkj/AzVId/EnQJVLcnlrAtCACsPisKWgA6QMACaIeVMKrSLP16/GyvERLmyzIGhIlprfmpiNkPeKlzGpJZBjvQ9gyK6YbexITEFjoBOH+rc27kFALCSKxGhr8m+BpHHmcGqCr79v7bFXE0p5TVFn00WbP7CfDjqAiwpcCF1JSDzA0e1mpHk3z7JXceQg9cdhPmhb1GiPMgbONSeTO3ASA9Hmi2JpwYCMaFcDsevVAA+eKSrQEkjYU3L0O4BRVlxUlWHYPSUEZ7vUlgH2imca6pD/WFYEzULj72MLeI9hpLkuXYUVaxLCBPiNoLKCyMIDsAiq5zyhmQyJFFjPo2l/JTKwtO8JCXR7B6sYp8j5gIir4Izbpm8r6VC8SBtafNcgynfehqs9Ov0yBsKKogo3fb/dSWdwANf36jQ766HaBQkp9NN0PFMLzbeXHaQA248MOP6ObqKsFg1c4iJ1UCY9A59hAUyXT+yAm0Y4auxq21/FEZ8pZFqan5qNaxvo0dP8WfeoVdsQAdZ3u7T4wtsxsO8PWKUA4FEoC3Ic9g5DBVte4SQJ5n6Ni2+DFnq4PZhBdCVwWnHh648sUfKncHdmbqTnIq6bN+RI9ZlY8MyeRKVVbbDU9mrmdM2aWlTeu4HQWd7J6ErHrTRDgkRJxKGbPDUemkX4Nhws= # GITHUB_TOKEN
-
-before_install:
-  - sudo apt-get update
-  - sudo apt-cache madison docker-ce
-  - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce=${DOCKER_VERSION}
-  - docker --version
-  - curl -L https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
-  - chmod +x docker-compose
-  - sudo mv docker-compose /usr/local/bin
-  - docker-compose --version
-  - export BRANCH=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then echo $TRAVIS_BRANCH; else echo $TRAVIS_PULL_REQUEST_BRANCH; fi)
-  - export DOCKER_TAG=$(if [ "$BRANCH" == "master" ]; then echo "latest"; else echo $BRANCH; fi)
-  - export WAN_IP=$(dig +short myip.opendns.com @resolver1.opendns.com)
-  - echo "WAN_IP=$WAN_IP, TRAVIS_BRANCH=$TRAVIS_BRANCH, PR=$PR, BRANCH=$BRANCH, DOCKER_TAG=$DOCKER_TAG"
-
-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
-
-before_script:
-  - docker run -d -p 8000:80 -e JLS_VIRTUAL_HOSTS=$WAN_IP --name $DOCKER_REPONAME $DOCKER_USERNAME/$DOCKER_REPONAME
-  - sleep 20
-  - docker logs $DOCKER_REPONAME
-
-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
-    && curl -X POST $MICROBADGER_HOOK
-
-branches:
-  except:
-    - /^[0-9]/
-
-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=

CHANGELOG.md

@@ -1,13 +1,91 @@
 # Changelog
 
+## 20308-RC4 (2019/10/10)
+
+* Optimize layers
+
+## 20308-RC3 (2019/10/10)
+
+* Multi-platform Docker image
+* Switch to GitHub Actions
+* :warning: Stop publishing Docker image on Quay
+* :warning: Run as non-root user
+* Set timezone through tzdata
+
+> :warning: **UPGRADE NOTES**
+> As the Docker container now runs as a non-root user, you have to first stop the container and change permissions to `data` volume:
+> ```
+> docker-compose stop
+> chown -R 1000:1000 data/
+> docker-compose pull
+> docker-compose up -d
+> ```
+
+## 20308-RC2 (2019/08/04)
+
+* Add healthcheck
+
+## 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)
+
+* JetBrains License Server 18692
+
+## 17955-RC1 (2018/09/26)
+
+* JetBrains License Server 17955
+
+## 17768-RC1 (2018/09/05)
+
+* JetBrains License Server 17768
+
+## 17437-RC1 (2018/07/30)
+
+* JetBrains License Server 17437
+
+## 17211-RC1 (2018/06/29)
+
+* JetBrains License Server 17211
+
+## 17043-RC1 (2018/05/31)
+
+* JetBrains License Server 17043
+
+## 16429-RC2 (2018/04/20)
+
+* JetBrains accidentally published 16743. Revert to 16429 (Issue #1)
+
 ## 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

@@ -0,0 +1,53 @@
+# syntax=docker/dockerfile:experimental
+FROM --platform=${TARGETPLATFORM:-linux/amd64} adoptopenjdk:12-jre-hotspot
+
+ARG TARGETPLATFORM
+ARG BUILDPLATFORM
+RUN printf "I am running on ${BUILDPLATFORM:-linux/amd64}, building for ${TARGETPLATFORM:-linux/amd64}\n$(uname -a)\n"
+
+LABEL maintainer="CrazyMax" \
+  org.label-schema.name="jetbrains-license-server" \
+  org.label-schema.description="JetBrains License Server" \
+  org.label-schema.url="https://github.com/crazy-max/docker-jetbrains-license-server" \
+  org.label-schema.vcs-url="https://github.com/crazy-max/docker-jetbrains-license-server" \
+  org.label-schema.vendor="CrazyMax" \
+  org.label-schema.schema-version="1.0"
+
+ENV JLS_PATH="/opt/jetbrains-license-server" \
+  JLS_VERSION="20308" \
+  JLS_SHA256="15cd436d41b1af8e273b8f8b037d654a9e9d9ca8a5f188e08426ca1024ba143a" \
+  TZ="UTC"
+
+RUN apt-get update \
+  && apt-get install -y \
+    bash \
+    curl \
+    zip \
+    tzdata \
+  && mkdir -p /data "$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 \
+  && unzip "/tmp/jls.zip" -d "$JLS_PATH" \
+  && rm -f "/tmp/jls.zip" \
+  && chmod a+x "$JLS_PATH/bin/license-server.sh" \
+  && ln -sf "$JLS_PATH/bin/license-server.sh" "/usr/local/bin/license-server" \
+  && groupadd -f -g 1000 jls \
+  && useradd -o -s /bin/bash -d /data -u 1000 -g 1000 -m jls \
+  && chown -R jls. /data "$JLS_PATH" \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+COPY entrypoint.sh /entrypoint.sh
+RUN chmod a+x /entrypoint.sh
+
+USER jls
+
+EXPOSE 8000
+WORKDIR /data
+VOLUME [ "/data" ]
+
+ENTRYPOINT [ "/entrypoint.sh" ]
+CMD [ "/usr/local/bin/license-server", "run" ]
+
+HEALTHCHECK --interval=10s --timeout=5s \
+  CMD license-server status || exit 1

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,33 +1,45 @@
 <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/tags?page=1&ordering=last_updated"><img src="https://img.shields.io/github/v/tag/crazy-max/docker-jetbrains-license-server?label=version&style=flat-square" alt="Latest Version"></a>
+  <a href="https://github.com/crazy-max/docker-jetbrains-license-server/actions?workflow=build"><img src="https://github.com/crazy-max/docker-jetbrains-license-server/workflows/build/badge.svg" 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://beerpay.io/crazy-max/docker-jetbrains-license-server"><img src="https://img.shields.io/beerpay/crazy-max/docker-jetbrains-license-server.svg?style=flat-square" alt="Beerpay"></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>
+  <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>
+  <br /><a href="https://www.patreon.com/crazymax"><img src="https://img.shields.io/badge/donate-patreon-f96854.svg?logo=patreon&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-00457c.svg?logo=paypal&style=flat-square" alt="Donate Paypal"></a>
 </p>
 
 ## About
 
-🐳 [JetBrains License Server](https://www.jetbrains.com/help/license_server/getting_started.html) Docker image based on Alpine Linux.<br />
+🐳 [JetBrains License Server](https://www.jetbrains.com/help/license_server/getting_started.html) Docker image based on AdoptOpenJDK.<br />
 If you are interested, [check out](https://hub.docker.com/r/crazymax/) my other 🐳 Docker images!
 
+💡 Want to be notified of new releases? Check out 🔔 [Diun (Docker Image Update Notifier)](https://github.com/crazy-max/diun) project!
+
 ## Features
 
-### Included
-
 * License server completely customizable via environment variables
 * Registration data and configuration in a single directory
-
-### From docker-compose
-
 * [Traefik](https://github.com/containous/traefik-library-image) as reverse proxy and creation/renewal of Let's Encrypt certificates
 
 ## Docker
 
+### Multi-platform image
+
+Following platforms for this image are available:
+
+```
+$ docker run --rm mplatform/mquery crazymax/jetbrains-license-server:latest
+Image: crazymax/jetbrains-license-server:latest
+ * Manifest List: Yes
+ * Supported platforms:
+   - linux/amd64
+   - linux/arm64
+   - linux/ppc64le
+   - linux/s390x
+```
+
 ### Environment variables
 
 * `TZ` : The timezone assigned to the container (default `UTC`)
@@ -47,13 +59,17 @@ If you are interested, [check out](https://hub.docker.com/r/crazymax/) my other
 
 * `/data` : Contains [registration data](https://www.jetbrains.com/help/license_server/migrate.html) and configuration
 
+> :warning: Note that the volume should be owned by uid `1000` and gid `1000`. If you don't give the volume correct permissions, the container may not start.
+
 ### Ports
 
-* `80` : Jetbrains License Server HTTP port
+* `8000` : 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
@@ -62,10 +78,12 @@ 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 \
+$ 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 \
@@ -95,14 +113,14 @@ 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:!
 
-[![Beerpay](https://beerpay.io/crazy-max/docker-jetbrains-license-server/badge.svg?style=beer-square)](https://beerpay.io/crazy-max/docker-jetbrains-license-server)
-or [![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
 

docker/.dockerignore

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

docker/Dockerfile

@@ -1,44 +0,0 @@
-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 \
-  org.label-schema.name="jetbrains-license-server" \
-  org.label-schema.description="JetBrains License Server image based on Alpine Linux" \
-  org.label-schema.version=$VERSION \
-  org.label-schema.url="https://github.com/crazy-max/docker-jetbrains-license-server" \
-  org.label-schema.vcs-ref=$VCS_REF \
-  org.label-schema.vcs-url="https://github.com/crazy-max/docker-jetbrains-license-server" \
-  org.label-schema.vendor="CrazyMax" \
-  org.label-schema.schema-version="1.0"
-
-RUN apk --update --no-cache add tzdata \
-  && rm -rf /var/cache/apk/* /tmp/*
-
-ENV JLS_PATH="/opt/jetbrains-license-server" \
-  JLS_VERSION="16743" \
-  JLS_SHA256="68a7e0e50a7438c02a527fdf9720a92fb1a47a130171ee579b3d778cedf34217"
-
-ADD entrypoint.sh /entrypoint.sh
-
-RUN apk --update --no-cache add -t build-dependencies \
-    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 \
-  && unzip "/tmp/jls.zip" -d "$JLS_PATH" \
-  && rm -f "/tmp/jls.zip" \
-  && chmod a+x "$JLS_PATH/bin/license-server.sh" \
-  && ln -sf "$JLS_PATH/bin/license-server.sh" "/usr/local/bin/license-server" \
-  && chmod a+x /entrypoint.sh \
-  && apk del build-dependencies \
-  && rm -rf /var/cache/apk/* /tmp/*
-
-EXPOSE 80
-VOLUME [ "/data" ]
-
-ENTRYPOINT [ "/entrypoint.sh" ]
-CMD [ "/usr/local/bin/license-server", "run" ]

docker/docker-compose.yml

@@ -1,62 +0,0 @@
-version: '3'
-
-services:
-  traefik:
-    image: traefik: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:

entrypoint.sh

@@ -1,21 +1,13 @@
 #!/bin/sh
 
-TZ=${TZ:-"UTC"}
 JLS_PATH="/opt/jetbrains-license-server"
 JLS_LISTEN_ADDRESS="0.0.0.0"
-JLS_PORT=80
-JLS_CONTEXT=${JLS_CONTEXT:-"/"}
-JLS_ACCESS_CONFIG=${JLS_ACCESS_CONFIG:-"/data/access-config.json"}
-
-# Timezone
-echo "Setting timezone to ${TZ}..."
-ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime
-echo ${TZ} > /etc/timezone
+JLS_PORT=8000
+JLS_CONTEXT=${JLS_CONTEXT:-/}
+JLS_ACCESS_CONFIG=${JLS_ACCESS_CONFIG:-/data/access-config.json}
 
 # Init
 echo "Initializing files and folders..."
-mkdir -p /data/registration
-ln -sf "/data/registration" "/root/.jb-license-server"
 touch "/data/access-config.json"
 
 # https://www.jetbrains.com/help/license_server/setting_host_and_port.html
@@ -24,7 +16,7 @@ license-server configure --listen ${JLS_LISTEN_ADDRESS} --port ${JLS_PORT} --con
 
 # https://www.jetbrains.com/help/license_server/setting_host_and_port.html
 if [ ! -z "$JLS_VIRTUAL_HOSTS" ] ; then
-  echo "Following virtual hosts will be used :"
+  echo "Following virtual hosts will be used:"
   for JLS_VIRTUAL_HOST in $(echo ${JLS_VIRTUAL_HOSTS} | tr "," "\n"); do
     echo "-> ${JLS_VIRTUAL_HOST}"
   done
@@ -39,7 +31,7 @@ fi
 
 # https://www.jetbrains.com/help/license_server/detailed_server_usage_statistics.html
 if [ ! -z "$JLS_SMTP_SERVER" -a ! -z "$JLS_STATS_RECIPIENTS" ] ; then
-  JLS_SMTP_PORT=${JLS_SMTP_PORT:-"25"}
+  JLS_SMTP_PORT=${JLS_SMTP_PORT:-25}
   echo "Enabling User Reporting via SMTP at $JLS_SMTP_SERVER:$JLS_SMTP_PORT..."
   license-server configure --smtp.server ${JLS_SMTP_SERVER} --smtp.server.port ${JLS_SMTP_PORT}
 

examples/compose/docker-compose.yml

@@ -0,0 +1,63 @@
+version: "3.2"
+
+services:
+  traefik:
+    image: traefik:1.7-alpine
+    container_name: traefik
+    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
+    container_name: jetbrains_license_server
+    depends_on:
+      - traefik
+    volumes:
+      - "jetbrains-license-server:/data"
+    labels:
+      - "traefik.enable=true"
+      - "traefik.backend=jetbrains-license-server"
+      - "traefik.port=8000"
+      - "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: