Infra/lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3002 from avoidik/master

Browse Source 
docker - add libtool, fix url context path
This commit is contained in:
Hossein Shafagh 2020-06-08 09:42:52 -07:00 committed by GitHub
commit a0c2357d81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docker/Dockerfile
View File

@ -3,6 +3,8 @@ FROM alpine:3.8
ARG VERSION ARG VERSION
ENV VERSION master ENV VERSION master
ARG URLCONTEXT
ENV uid 1337 ENV uid 1337
ENV gid 1337 ENV gid 1337
ENV user lemur ENV user lemur
@ -22,6 +24,7 @@ RUN addgroup -S ${group} -g ${gid} && \
gcc \ gcc \
autoconf \ autoconf \
automake \ automake \
libtool \
make \ make \
nasm \ nasm \
zlib-dev \ zlib-dev \
@ -42,7 +45,7 @@ WORKDIR /opt/lemur
RUN npm install --unsafe-perm && \ RUN npm install --unsafe-perm && \
pip3 install -e . && \ pip3 install -e . && \
node_modules/.bin/gulp build && \ node_modules/.bin/gulp build && \
node_modules/.bin/gulp package --urlContextPath=$(urlContextPath) && \ node_modules/.bin/gulp package --urlContextPath=${URLCONTEXT} && \
apk del build-dependencies apk del build-dependencies
COPY entrypoint / COPY entrypoint /

5
docker/Dockerfile-src
View File

@ -3,6 +3,8 @@ FROM alpine:3.8
ARG VERSION ARG VERSION
ENV VERSION master ENV VERSION master
ARG URLCONTEXT
ENV uid 1337 ENV uid 1337
ENV gid 1337 ENV gid 1337
ENV user lemur ENV user lemur
@ -22,6 +24,7 @@ RUN addgroup -S ${group} -g ${gid} && \
gcc \ gcc \
autoconf \ autoconf \
automake \ automake \
libtool \
make \ make \
nasm \ nasm \
zlib-dev \ zlib-dev \
@ -42,7 +45,7 @@ RUN chown -R $user:$group /opt/lemur/ /home/lemur/.lemur/ && \
npm install --unsafe-perm && \ npm install --unsafe-perm && \
pip3 install -e . && \ pip3 install -e . && \
node_modules/.bin/gulp build && \ node_modules/.bin/gulp build && \
node_modules/.bin/gulp package --urlContextPath=$(urlContextPath) && \ node_modules/.bin/gulp package --urlContextPath=${URLCONTEXT} && \
apk del build-dependencies apk del build-dependencies
COPY docker/entrypoint / COPY docker/entrypoint /