From 7fad7df7680d92be2943387032fb774b4c013372 Mon Sep 17 00:00:00 2001 From: "Vasilyev, Viacheslav" Date: Sat, 6 Jun 2020 16:23:12 +0300 Subject: [PATCH] docker - add libtool, fix url context path --- docker/Dockerfile | 5 ++++- docker/Dockerfile-src | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) 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 /