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/requirements-dev.txt b/requirements-dev.txt index 3f53aaf7..53a2becd 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -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..3904d2d4 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 diff --git a/requirements-tests.txt b/requirements-tests.txt index 00de5ce1..a66204f6 100644 --- a/requirements-tests.txt +++ b/requirements-tests.txt @@ -59,8 +59,8 @@ 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 diff --git a/requirements.txt b/requirements.txt index e1b962c3..0150a239 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