Compare commits
8 Commits
Author | SHA1 | Date | |
---|---|---|---|
Sambo Chea | 148519fb43 | ||
CrazyMax | 568e2d961e | ||
CrazyMax | b6570cbf4a | ||
CrazyMax | d128133e79 | ||
CrazyMax | 61df733099 | ||
CrazyMax | 62de4c614c | ||
CrazyMax | 6f91dbf64c | ||
CrazyMax | 737f2bd964 |
|
@ -0,0 +1 @@
|
|||
* @crazy-max
|
|
@ -24,6 +24,7 @@ about: Create a report to help us improve
|
|||
* Docker version (type `docker --version`) :
|
||||
* Docker compose version if applicable (type `docker-compose --version`) :
|
||||
* Platform (Debian 9, Ubuntu 18.04, ...) :
|
||||
* System info (type `uname -a`) :
|
||||
* Include all necessary configuration files : `docker-compose.yml`, `.env`, ...
|
||||
|
||||
### Docker info
|
||||
|
|
14
CHANGELOG.md
14
CHANGELOG.md
|
@ -1,5 +1,19 @@
|
|||
# Changelog
|
||||
|
||||
## 22218-RC1 (2020/02/04)
|
||||
|
||||
* JetBrains License Server 22218
|
||||
* AdoptOpenJDK JRE 13
|
||||
|
||||
## 21137-RC5 (2019/12/07)
|
||||
|
||||
* Fix timezone
|
||||
|
||||
## 21137-RC4 (2019/11/28)
|
||||
|
||||
* Proxy type defaults to `https`
|
||||
* More unset
|
||||
|
||||
## 21137-RC3 (2019/11/28)
|
||||
|
||||
* Add env vars to set proxy settings (#21)
|
||||
|
|
26
Dockerfile
26
Dockerfile
|
@ -1,5 +1,5 @@
|
|||
# syntax=docker/dockerfile:experimental
|
||||
FROM --platform=${TARGETPLATFORM:-linux/amd64} adoptopenjdk:12-jre-hotspot as suexec
|
||||
FROM --platform=${TARGETPLATFORM:-linux/amd64} adoptopenjdk:13-jre-hotspot as suexec
|
||||
|
||||
ARG BUILD_DATE
|
||||
ARG VCS_REF
|
||||
|
@ -18,26 +18,26 @@ RUN apt-get update \
|
|||
&& chown root:root /usr/local/bin/su-exec \
|
||||
&& chmod 0755 /usr/local/bin/su-exec
|
||||
|
||||
FROM --platform=${TARGETPLATFORM:-linux/amd64} adoptopenjdk:12-jre-hotspot
|
||||
FROM --platform=${TARGETPLATFORM:-linux/amd64} adoptopenjdk:13-jre-hotspot
|
||||
|
||||
ARG BUILD_DATE
|
||||
ARG VCS_REF
|
||||
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" \
|
||||
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"
|
||||
org.opencontainers.image.created=$BUILD_DATE \
|
||||
org.opencontainers.image.url="https://github.com/crazy-max/docker-jetbrains-license-server" \
|
||||
org.opencontainers.image.source="https://github.com/crazy-max/docker-jetbrains-license-server" \
|
||||
org.opencontainers.image.version=$VERSION \
|
||||
org.opencontainers.image.revision=$VCS_REF \
|
||||
org.opencontainers.image.vendor="CrazyMax" \
|
||||
org.opencontainers.image.title="JetBrains License Server" \
|
||||
org.opencontainers.image.description="JetBrains License Server" \
|
||||
org.opencontainers.image.licenses="MIT"
|
||||
|
||||
ENV JLS_PATH="/opt/jetbrains-license-server" \
|
||||
JLS_VERSION="21137" \
|
||||
JLS_SHA256="05241f0d41644ecc7679a879c829e57d423e151b997b45c5e986d498d6fe2f21" \
|
||||
JLS_VERSION="22218" \
|
||||
JLS_SHA256="f68027a8b2b4f2d9b03fe0b0fef4a9ffc0fdfaf2657ab26d545777973311b601" \
|
||||
TZ="UTC" \
|
||||
PUID="1000" \
|
||||
PGID="1000"
|
||||
|
|
2
LICENSE
2
LICENSE
|
@ -1,6 +1,6 @@
|
|||
MIT License
|
||||
|
||||
Copyright (c) 2018-2019 CrazyMax
|
||||
Copyright (c) 2018-2020 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
|
||||
|
|
|
@ -45,8 +45,8 @@ Image: crazymax/jetbrains-license-server:latest
|
|||
### Environment variables
|
||||
|
||||
* `TZ`: The timezone assigned to the container (default `UTC`)
|
||||
* `PUID`: Process UID (default `1000`)
|
||||
* `PGID`: Process GID (default `1000`)
|
||||
* `PUID`: JLS UID (default `1000`)
|
||||
* `PGID`: JLS GID (default `1000`)
|
||||
* `JLS_VIRTUAL_HOSTS`: [Virtual hosts](https://www.jetbrains.com/help/license_server/setting_host_and_port.html#d1010e63) where license server will be available (comma delimited for several hosts)
|
||||
* `JLS_CONTEXT`: [Context path](https://www.jetbrains.com/help/license_server/setting_host_and_port.html#d1010e63) used by the license server (default `/`)
|
||||
* `JLS_PROXY_TYPE`: Type of [proxy](https://www.jetbrains.com/help/license_server/configuring_proxy_settings.html) to use. Can be `http` or `https` (default `https`)
|
||||
|
|
|
@ -1,11 +1,13 @@
|
|||
#!/bin/sh
|
||||
|
||||
TZ=${TZ:-UTC}
|
||||
|
||||
JLS_PATH="/opt/jetbrains-license-server"
|
||||
JLS_LISTEN_ADDRESS="0.0.0.0"
|
||||
JLS_PORT=8000
|
||||
JLS_CONTEXT=${JLS_CONTEXT:-/}
|
||||
JLS_ACCESS_CONFIG=${JLS_ACCESS_CONFIG:-/data/access-config.json}
|
||||
JLS_PROXY_TYPE=${JLS_PROXY_TYPE:-http}
|
||||
JLS_PROXY_TYPE=${JLS_PROXY_TYPE:-https}
|
||||
|
||||
if [ -n "${PGID}" ] && [ "${PGID}" != "$(id -g jls)" ]; then
|
||||
echo "Switching to PGID ${PGID}..."
|
||||
|
@ -17,6 +19,11 @@ if [ -n "${PUID}" ] && [ "${PUID}" != "$(id -u jls)" ]; then
|
|||
sed -i -e "s/^jls:\([^:]*\):[0-9]*:\([0-9]*\)/jls:\1:${PUID}:\2/" /etc/passwd
|
||||
fi
|
||||
|
||||
# Timezone
|
||||
echo "Setting timezone to ${TZ}..."
|
||||
ln -snf /usr/share/zoneinfo/${TZ} /etc/localtime
|
||||
echo ${TZ} > /etc/timezone
|
||||
|
||||
# Init
|
||||
echo "Initializing files and folders..."
|
||||
su-exec jls:jls touch "/data/access-config.json"
|
||||
|
@ -46,10 +53,10 @@ if [ ! -z "$JLS_PROXY_HOST" -a ! -z "$JLS_PROXY_PORT" ]; then
|
|||
su-exec jls:jls license-server configure \
|
||||
-J-D${JLS_PROXY_TYPE}.proxyUser=${JLS_PROXY_USER} \
|
||||
-J-D${JLS_PROXY_TYPE}.proxyPassword=${JLS_PROXY_PASSWORD}
|
||||
unset JLS_PROXY_USER
|
||||
unset JLS_PROXY_PASSWORD
|
||||
fi
|
||||
fi
|
||||
unset JLS_PROXY_USER
|
||||
unset JLS_PROXY_PASSWORD
|
||||
|
||||
# https://www.jetbrains.com/help/license_server/configuring_user_restrictions.html
|
||||
if [ -s "$JLS_ACCESS_CONFIG" ]; then
|
||||
|
@ -68,6 +75,8 @@ if [ ! -z "$JLS_SMTP_SERVER" -a ! -z "$JLS_STATS_RECIPIENTS" ]; then
|
|||
su-exec jls:jls license-server configure --smtp.server.username ${JLS_SMTP_USERNAME}
|
||||
su-exec jls:jls license-server configure --smtp.server.password ${JLS_SMTP_PASSWORD}
|
||||
fi
|
||||
unset JLS_SMTP_USERNAME
|
||||
unset JLS_SMTP_PASSWORD
|
||||
|
||||
if [ ! -z "$JLS_STATS_FROM" ]; then
|
||||
echo "Setting stats sender to $JLS_STATS_FROM..."
|
||||
|
|
|
@ -0,0 +1,3 @@
|
|||
build:
|
||||
docker:
|
||||
web: Dockerfile
|
Loading…
Reference in New Issue
Block a user