Merge pull request #10 from casz/master

Upgrade to JetBrains License Server 18692

.dockerignore

@@ -8,6 +8,7 @@
 /.editorconfig
 /.gitignore
 /.travis.yml
+/build.sh
 /CHANGELOG.md
 /LICENSE
 /README.md

.travis.yml

@@ -5,56 +5,22 @@ services:
 
 env:
   global:
-    - VERSION=17768
-    - GITHUB_REPO=crazy-max/docker-jetbrains-license-server
+    - VERSION=18692
+    - 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
-    - secure: CRv5ONsqQ7WPkj/AzVId/EnQJVLcnlrAtCACsPisKWgA6QMACaIeVMKrSLP16/GyvERLmyzIGhIlprfmpiNkPeKlzGpJZBjvQ9gyK6YbexITEFjoBOH+rc27kFALCSKxGhr8m+BpHHmcGqCr79v7bFXE0p5TVFn00WbP7CfDjqAiwpcCF1JSDzA0e1mpHk3z7JXceQg9cdhPmhb1GiPMgbONSeTO3ASA9Hmi2JpwYCMaFcDsevVAA+eKSrQEkjYU3L0O4BRVlxUlWHYPSUEZ7vUlgH2imca6pD/WFYEzULj72MLeI9hpLkuXYUVaxLCBPiNoLKCyMIDsAiq5zyhmQyJFFjPo2l/JTKwtO8JCXR7B6sYp8j5gIir4Izbpm8r6VC8SBtafNcgynfehqs9Ov0yBsKKogo3fb/dSWdwANf36jQ766HaBQkp9NN0PFMLzbeXHaQA248MOP6ObqKsFg1c4iJ1UCY9A59hAUyXT+yAm0Y4auxq21/FEZ8pZFqan5qNaxvo0dP8WfeoVdsQAdZ3u7T4wtsxsO8PWKUA4FEoC3Ic9g5DBVte4SQJ5n6Ni2+DFnq4PZhBdCVwWnHh648sUfKncHdmbqTnIq6bN+RI9ZlY8MyeRKVVbbDU9mrmdM2aWlTeu4HQWd7J6ErHrTRDgkRJxKGbPDUemkX4Nhws= # GITHUB_TOKEN
 
 before_install:
   - sudo apt-get update
   - docker --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 .
-
-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]/
+script: ./build.sh
 
 notifications:
   webhooks:

CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
-## 17437-RC1 (2018/09/05)
+## 18692-RC1 (2018/12/25)
+
+* Upgrade to JetBrains License Server 18692
+
+## 17955-RC1 (2018/09/26)
+
+* Upgrade to JetBrains License Server 17955
+
+## 17768-RC1 (2018/09/05)
 
 * Upgrade to JetBrains License Server 17768
 

Dockerfile

@@ -7,7 +7,7 @@ ARG VERSION
 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.description="JetBrains License Server" \
   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 \
@@ -15,16 +15,15 @@ LABEL maintainer="CrazyMax" \
   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="17768" \
-  JLS_SHA256="ede8a65eaffbfe24807339cd2e2563aa2785c26ae6679e8519613a225074c933"
+  JLS_VERSION="18692" \
+  JLS_SHA256="e71c4abae7d144dda7af5775dd6812e93d5934de39134d97420b4b0db29e16f4"
 
-ADD entrypoint.sh /entrypoint.sh
+COPY entrypoint.sh /entrypoint.sh
 
-RUN apk --update --no-cache add -t build-dependencies \
+RUN apk --update --no-cache add \
+    tzdata \
+  && 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" \

README.md

@@ -6,6 +6,7 @@
   <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>
 </p>
 

build.sh

@@ -0,0 +1,115 @@
+#!/usr/bin/env bash
+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}
+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"}
+
+# Check local or travis
+BRANCH=${TRAVIS_BRANCH:-local}
+if [[ ${TRAVIS_PULL_REQUEST} == "true" ]]; then
+  BRANCH=${TRAVIS_PULL_REQUEST_BRANCH}
+fi
+DOCKER_TAG=${BRANCH:-local}
+if [[ "$BRANCH" == "master" ]]; then
+  DOCKER_TAG=latest
+elif [[ "$BRANCH" == "local" ]]; then
+  BUILD_DATE=
+  VERSION=local
+fi
+
+echo "PROJECT=${PROJECT}"
+echo "VERSION=${VERSION}"
+echo "BUILD_DATE=${BUILD_DATE}"
+echo "BUILD_TAG=${BUILD_TAG}"
+echo "VCS_REF=${VCS_REF}"
+echo "PUSH_LATEST=${PUSH_LATEST}"
+echo "DOCKER_LOGIN=${DOCKER_LOGIN}"
+echo "DOCKER_USERNAME=${DOCKER_USERNAME}"
+echo "DOCKER_REPONAME=${DOCKER_REPONAME}"
+echo "QUAY_LOGIN=${QUAY_LOGIN}"
+echo "QUAY_USERNAME=${QUAY_USERNAME}"
+echo "QUAY_REPONAME=${QUAY_REPONAME}"
+echo "TRAVIS_BRANCH=${TRAVIS_BRANCH}"
+echo "TRAVIS_PULL_REQUEST=${TRAVIS_PULL_REQUEST}"
+echo "BRANCH=${BRANCH}"
+echo "DOCKER_TAG=${DOCKER_TAG}"
+echo
+
+# Build
+echo "### Build"
+docker build \
+  --build-arg BUILD_DATE=${BUILD_DATE} \
+  --build-arg VCS_REF=${VCS_REF} \
+  --build-arg VERSION=${VERSION} \
+  -t ${BUILD_TAG} .
+echo
+
+echo "### Test"
+docker rm -f ${PROJECT} || true
+docker run -d -p 8000:80 \
+  -e "JLS_VIRTUAL_HOSTS=docker.test" \
+  --name ${PROJECT} ${BUILD_TAG}
+echo
+
+echo "### Waiting for ${PROJECT} to be up..."
+TIMEOUT=$((SECONDS + RUNNING_TIMEOUT))
+while read LOGLINE; do
+  echo ${LOGLINE}
+  if [[ ${LOGLINE} == *"${RUNNING_LOG_CHECK}"* ]]; then
+    echo "Container up!"
+    break
+  fi
+  if [[ $SECONDS -gt ${TIMEOUT} ]]; then
+    >&2 echo "ERROR: Failed to run ${PROJECT} container"
+    docker rm -f ${PROJECT} > /dev/null 2>&1 || true
+    exit 1
+  fi
+done < <(docker logs -f ${PROJECT} 2>&1)
+docker rm -f ${PROJECT} > /dev/null 2>&1 || true
+echo
+
+if [ "${VERSION}" == "local" -o "${TRAVIS_PULL_REQUEST}" == "true" ]; then
+  echo "INFO: This is a PR or a local build, skipping push..."
+  exit 0
+fi
+if [[ ! -z ${DOCKER_PASSWORD} ]]; then
+  echo "### Push to Docker Hub..."
+  echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_LOGIN" --password-stdin > /dev/null 2>&1
+  if [ "${DOCKER_TAG}" == "latest" -a "${PUSH_LATEST}" == "true" ]; then
+    docker tag ${BUILD_TAG} ${DOCKER_USERNAME}/${DOCKER_REPONAME}:${DOCKER_TAG}
+  fi
+  if [[ "${VERSION}" != "latest" ]]; 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
+  echo "### Push to Quay..."
+  echo "$QUAY_PASSWORD" | docker login quay.io --username "$QUAY_LOGIN" --password-stdin > /dev/null 2>&1
+  if [ "${DOCKER_TAG}" == "latest" -a "${PUSH_LATEST}" == "true" ]; then
+    docker tag ${BUILD_TAG} quay.io/${QUAY_USERNAME}/${QUAY_REPONAME}:${DOCKER_TAG}
+  fi
+  if [[ "${VERSION}" != "latest" ]]; then
+    docker tag ${BUILD_TAG} quay.io/${QUAY_USERNAME}/${QUAY_REPONAME}:${VERSION}
+  fi
+  docker push quay.io/${QUAY_USERNAME}/${QUAY_REPONAME}
+  echo
+fi

entrypoint.sh

@@ -1,11 +1,11 @@
 #!/bin/sh
 
-TZ=${TZ:-"UTC"}
+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"}
+JLS_CONTEXT=${JLS_CONTEXT:-/}
+JLS_ACCESS_CONFIG=${JLS_ACCESS_CONFIG:-/data/access-config.json}
 
 # Timezone
 echo "Setting timezone to ${TZ}..."
@@ -39,7 +39,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}