diff --git a/docker/Dockerfile b/docker/Dockerfile index 5c80606f..d12c55ee 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,6 +3,8 @@ FROM alpine:3.8 ARG VERSION ENV VERSION master +ARG URLCONTEXT + ENV uid 1337 ENV gid 1337 ENV user lemur @@ -22,6 +24,7 @@ RUN addgroup -S ${group} -g ${gid} && \ gcc \ autoconf \ automake \ + libtool \ make \ nasm \ zlib-dev \ @@ -42,7 +45,7 @@ WORKDIR /opt/lemur RUN npm install --unsafe-perm && \ pip3 install -e . && \ node_modules/.bin/gulp build && \ - node_modules/.bin/gulp package --urlContextPath=$(urlContextPath) && \ + node_modules/.bin/gulp package --urlContextPath=${URLCONTEXT} && \ apk del build-dependencies COPY entrypoint / diff --git a/docker/Dockerfile-src b/docker/Dockerfile-src index c23f249c..50d408b0 100644 --- a/docker/Dockerfile-src +++ b/docker/Dockerfile-src @@ -3,6 +3,8 @@ FROM alpine:3.8 ARG VERSION ENV VERSION master +ARG URLCONTEXT + ENV uid 1337 ENV gid 1337 ENV user lemur @@ -22,6 +24,7 @@ RUN addgroup -S ${group} -g ${gid} && \ gcc \ autoconf \ automake \ + libtool \ make \ nasm \ zlib-dev \ @@ -42,7 +45,7 @@ RUN chown -R $user:$group /opt/lemur/ /home/lemur/.lemur/ && \ npm install --unsafe-perm && \ pip3 install -e . && \ node_modules/.bin/gulp build && \ - node_modules/.bin/gulp package --urlContextPath=$(urlContextPath) && \ + node_modules/.bin/gulp package --urlContextPath=${URLCONTEXT} && \ apk del build-dependencies COPY docker/entrypoint / diff --git a/lemur/plugins/lemur_email/templates/expiration.html b/lemur/plugins/lemur_email/templates/expiration.html index f5185acd..16b59733 100644 --- a/lemur/plugins/lemur_email/templates/expiration.html +++ b/lemur/plugins/lemur_email/templates/expiration.html @@ -75,7 +75,8 @@ -
This is a Lemur certificate expiration notice. Please verify that the following certificates are no longer used. +
This is a Lemur certificate expiration notice. Please verify that the following certificates are no longer used, + and disable notifications via the Notify toggle in Lemur, if applicable. diff --git a/requirements-dev.txt b/requirements-dev.txt index 3f53aaf7..2aee6e90 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -6,7 +6,7 @@ # appdirs==1.4.3 # via virtualenv bleach==3.1.4 # via readme-renderer -certifi==2020.4.5.1 # via requests +certifi==2020.4.5.2 # via requests cffi==1.14.0 # via cryptography cfgv==3.1.0 # via pre-commit chardet==3.0.4 # via requests @@ -21,7 +21,7 @@ invoke==1.4.1 # via -r requirements-dev.in jeepney==0.4.3 # via keyring, secretstorage keyring==21.2.0 # via twine mccabe==0.6.1 # via flake8 -nodeenv==1.3.5 # via -r requirements-dev.in, pre-commit +nodeenv==1.4.0 # via -r requirements-dev.in, pre-commit pkginfo==1.5.0.1 # via twine pre-commit==2.4.0 # via -r requirements-dev.in pycodestyle==2.3.1 # via flake8 diff --git a/requirements-docs.txt b/requirements-docs.txt index 6b9f94af..4f2ef20c 100644 --- a/requirements-docs.txt +++ b/requirements-docs.txt @@ -4,7 +4,7 @@ # # pip-compile --no-index --output-file=requirements-docs.txt requirements-docs.in # -acme==1.4.0 # via -r requirements.txt +acme==1.5.0 # via -r requirements.txt alabaster==0.7.12 # via sphinx alembic-autogenerate-enums==0.0.2 # via -r requirements.txt alembic==1.4.2 # via -r requirements.txt, flask-migrate @@ -17,9 +17,9 @@ bcrypt==3.1.7 # via -r requirements.txt, flask-bcrypt, paramiko billiard==3.6.3.0 # via -r requirements.txt, celery blinker==1.4 # via -r requirements.txt, flask-mail, flask-principal, raven boto3==1.13.19 # via -r requirements.txt -botocore==1.16.19 # via -r requirements.txt, boto3, s3transfer +botocore==1.16.25 # via -r requirements.txt, boto3, s3transfer celery[redis]==4.4.2 # via -r requirements.txt -certifi==2020.4.5.1 # via -r requirements.txt, requests +certifi==2020.4.5.2 # via -r requirements.txt, requests certsrv==2.1.1 # via -r requirements.txt cffi==1.14.0 # via -r requirements.txt, bcrypt, cryptography, pynacl chardet==3.0.4 # via -r requirements.txt, requests @@ -45,7 +45,7 @@ gunicorn==20.0.4 # via -r requirements.txt hvac==0.10.3 # via -r requirements.txt idna==2.9 # via -r requirements.txt, requests imagesize==1.2.0 # via sphinx -inflection==0.4.0 # via -r requirements.txt +inflection==0.5.0 # via -r requirements.txt itsdangerous==1.1.0 # via -r requirements.txt, flask javaobj-py3==0.4.0.1 # via -r requirements.txt, pyjks jinja2==2.11.2 # via -r requirements.txt, flask, sphinx @@ -82,7 +82,7 @@ python-ldap==3.2.0 # via -r requirements.txt pytz==2019.3 # via -r requirements.txt, acme, babel, celery, flask-restful, pyrfc3339 pyyaml==5.3.1 # via -r requirements.txt, cloudflare raven[flask]==6.10.0 # via -r requirements.txt -redis==3.5.2 # via -r requirements.txt, celery +redis==3.5.3 # via -r requirements.txt, celery requests-toolbelt==0.9.1 # via -r requirements.txt, acme requests[security]==2.23.0 # via -r requirements.txt, acme, certsrv, cloudflare, hvac, requests-toolbelt, sphinx retrying==1.3.3 # via -r requirements.txt @@ -90,7 +90,7 @@ s3transfer==0.3.3 # via -r requirements.txt, boto3 six==1.15.0 # via -r requirements.txt, acme, bcrypt, cryptography, flask-cors, flask-restful, hvac, josepy, jsonlines, packaging, pynacl, pyopenssl, python-dateutil, retrying, sphinxcontrib-httpdomain, sqlalchemy-utils snowballstemmer==2.0.0 # via sphinx sphinx-rtd-theme==0.4.3 # via -r requirements-docs.in -sphinx==3.0.4 # via -r requirements-docs.in, sphinx-rtd-theme, sphinxcontrib-httpdomain +sphinx==3.1.0 # via -r requirements-docs.in, sphinx-rtd-theme, sphinxcontrib-httpdomain sphinxcontrib-applehelp==1.0.2 # via sphinx sphinxcontrib-devhelp==1.0.2 # via sphinx sphinxcontrib-htmlhelp==1.0.3 # via sphinx diff --git a/requirements-tests.txt b/requirements-tests.txt index 00de5ce1..f4d6fc7a 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -12,8 +12,8 @@ bandit==1.6.2 # via -r requirements-tests.in black==19.10b0 # via -r requirements-tests.in boto3==1.13.19 # via aws-sam-translator, moto boto==2.49.0 # via moto -botocore==1.16.19 # via aws-xray-sdk, boto3, moto, s3transfer -certifi==2020.4.5.1 # via requests +botocore==1.16.25 # via aws-xray-sdk, boto3, moto, s3transfer +certifi==2020.4.5.2 # via requests cffi==1.14.0 # via cryptography cfn-lint==0.29.5 # via moto chardet==3.0.4 # via requests @@ -59,13 +59,13 @@ pyflakes==2.2.0 # via -r requirements-tests.in pyparsing==2.4.7 # via packaging pyrsistent==0.16.0 # via jsonschema pytest-flask==1.0.0 # via -r requirements-tests.in -pytest-mock==3.1.0 # via -r requirements-tests.in -pytest==5.4.2 # via -r requirements-tests.in, pytest-flask, pytest-mock +pytest-mock==3.1.1 # via -r requirements-tests.in +pytest==5.4.3 # via -r requirements-tests.in, pytest-flask, pytest-mock python-dateutil==2.8.1 # via botocore, faker, freezegun, moto python-jose==3.1.0 # via moto pytz==2019.3 # via moto pyyaml==5.3.1 # via -r requirements-tests.in, bandit, cfn-lint, moto -redis==3.5.2 # via fakeredis +redis==3.5.3 # via fakeredis regex==2020.4.4 # via black requests-mock==1.8.0 # via -r requirements-tests.in requests==2.23.0 # via docker, moto, requests-mock, responses diff --git a/requirements.txt b/requirements.txt index e1b962c3..22a86a8c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ # # pip-compile --no-index --output-file=requirements.txt requirements.in # -acme==1.4.0 # via -r requirements.in +acme==1.5.0 # via -r requirements.in alembic-autogenerate-enums==0.0.2 # via -r requirements.in alembic==1.4.2 # via flask-migrate amqp==2.5.2 # via kombu @@ -15,9 +15,9 @@ bcrypt==3.1.7 # via flask-bcrypt, paramiko billiard==3.6.3.0 # via celery blinker==1.4 # via flask-mail, flask-principal, raven boto3==1.13.19 # via -r requirements.in -botocore==1.16.19 # via -r requirements.in, boto3, s3transfer +botocore==1.16.25 # via -r requirements.in, boto3, s3transfer celery[redis]==4.4.2 # via -r requirements.in -certifi==2020.4.5.1 # via -r requirements.in, requests +certifi==2020.4.5.2 # via -r requirements.in, requests certsrv==2.1.1 # via -r requirements.in cffi==1.14.0 # via bcrypt, cryptography, pynacl chardet==3.0.4 # via requests @@ -42,7 +42,7 @@ future==0.18.2 # via -r requirements.in, cloudflare gunicorn==20.0.4 # via -r requirements.in hvac==0.10.3 # via -r requirements.in idna==2.9 # via requests -inflection==0.4.0 # via -r requirements.in +inflection==0.5.0 # via -r requirements.in itsdangerous==1.1.0 # via flask javaobj-py3==0.4.0.1 # via pyjks jinja2==2.11.2 # via -r requirements.in, flask @@ -76,7 +76,7 @@ python-ldap==3.2.0 # via -r requirements.in pytz==2019.3 # via acme, celery, flask-restful, pyrfc3339 pyyaml==5.3.1 # via -r requirements.in, cloudflare raven[flask]==6.10.0 # via -r requirements.in -redis==3.5.2 # via -r requirements.in, celery +redis==3.5.3 # via -r requirements.in, celery requests-toolbelt==0.9.1 # via acme requests[security]==2.23.0 # via -r requirements.in, acme, certsrv, cloudflare, hvac, requests-toolbelt retrying==1.3.3 # via -r requirements.in