docker improvement

This commit is contained in:
Olof Hagsand 2018-08-05 12:20:37 +02:00
parent 7c94991fe9
commit 7564bcd9b2

View file

@ -40,7 +40,6 @@ RUN apt-get update && apt-get install -y \
libfcgi-dev \ libfcgi-dev \
libcurl4-openssl-dev libcurl4-openssl-dev
RUN groupadd clicon RUN groupadd clicon
# Create a directory to hold source-code, dependencies etc # Create a directory to hold source-code, dependencies etc
@ -49,7 +48,7 @@ WORKDIR /clixon
# Clone cligen and clixon # Clone cligen and clixon
RUN git clone https://github.com/olofhagsand/cligen.git RUN git clone https://github.com/olofhagsand/cligen.git
RUN git clone https://github.com/clicon/clixon.git RUN git clone -b develop https://github.com/clicon/clixon.git
# Build cligen # Build cligen
WORKDIR /clixon/cligen WORKDIR /clixon/cligen
@ -59,12 +58,13 @@ RUN make install
# Build clixon # Build clixon
WORKDIR /clixon/clixon WORKDIR /clixon/clixon
RUN git checkout -b develop origin/develop
RUN ./configure RUN ./configure
RUN make RUN make
RUN make install RUN make install
RUN make install-include RUN make install-include
RUN rm -rf /clixon
RUN ldconfig RUN ldconfig