Upgrade to JetBrains License Server 19340 (#15)

.travis.yml

@@ -5,7 +5,7 @@ services:
 
 env:
   global:
-    - VERSION=18692
+    - VERSION=19340
     - DOCKER_LOGIN=crazymax
     - DOCKER_USERNAME=crazymax
     - DOCKER_REPONAME=jetbrains-license-server

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 19340-RC1 (2019/03/15)
+
+* Upgrade to 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

Dockerfile

@@ -16,8 +16,8 @@ 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="19340" \
+  JLS_SHA256="2e09f4e7440b1c5d29d622f255c640cc33c9b43a939fe2302b228b79ef7327b8"
 
 COPY entrypoint.sh /entrypoint.sh
 
@@ -36,7 +36,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

@@ -2,7 +2,7 @@
 
 <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://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>
@@ -49,7 +49,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 +69,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 \

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

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"