experiments/clixon
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed libevhtp tests to compile from clicon instead of criticalstack

Browse source
This commit is contained in:
Olof hagsand 2021-03-03 16:01:29 +01:00
parent b2f9c59a34
commit e8cd587ded
9 changed files with 117 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docker/main/Dockerfile
View file

@ -94,7 +94,7 @@ MAINTAINER Olof Hagsand <olof@hagsand.se>
RUN apk add --update flex bison fcgi-dev
# Test-specific (for test scripts)
RUN apk add --update sudo curl procps grep make bash
RUN apk add --update sudo curl procps grep make bash # iproute2 # contains ip
# Create clicon user and group
RUN adduser -D -H clicon

21
docker/main/Dockerfile.evhtp
View file

@ -47,14 +47,18 @@ RUN apk add --update libevent cmake libevent-dev
# clone libevhtp
WORKDIR /clixon
RUN git clone https://github.com/clicon/libevhtp.git
WORKDIR /clixon/libevhtp/build
RUN cmake -DEVHTP_DISABLE_REGEX=ON -DEVHTP_DISABLE_EVTHR=ON -DBUILD_SHARED_LIBS=OFF ..
RUN make
RUN make install
# NOTE: Patch include queue.h to use the queue.h included in the evhtp release instead
RUN (cd /usr/local/include/evhtp/; sed -i -e 's/<sys\/queue.h>/<evhtp\/sys\/queue.h>/' evhtp.h)
#RUN git clone https://github.com/criticalstack/libevhtp.git
#WORKDIR /clixon/libevhtp/build
#RUN cmake -DEVHTP_DISABLE_REGEX=ON -DEVHTP_DISABLE_EVTHR=ON -DBUILD_SHARED_LIBS=OFF ..
RUN git clone https://github.com/clicon/libevhtp.git
WORKDIR /clixon/libevhtp
RUN ./configure
RUN make
RUN mkdir /usr/local/include
RUN make install
RUN mkdir /clixon/build
WORKDIR /clixon
@ -118,7 +122,7 @@ RUN adduser -D -H www-data
RUN apk add --update openssl libevent
# Test-specific (for test scripts)
RUN apk add --update sudo curl procps grep make bash
RUN apk add --update sudo curl procps grep make bash # iproute2 # contains ip - but CAP_SYS_ADMIN isssue
# Expose https port for restconf
EXPOSE 80/tcp
@ -130,6 +134,7 @@ RUN adduser www-data clicon
COPY --from=0 /clixon/build/ /usr/local/
COPY --from=0 /www-data /www-data
COPY --from=0 /usr/local/lib/libevhtp.so* /usr/local/lib/
# Manually created
RUN chown www-data /www-data

2
docker/main/Dockerfile.fcgi
View file

@ -103,7 +103,7 @@ RUN adduser -D -H www-data
RUN apk add --update nginx
# Test-specific (for test scripts)
RUN apk add --update sudo curl procps grep make bash
RUN apk add --update sudo curl procps grep make bash # iproute2 # contains ip
# Expose nginx port for restconf
EXPOSE 80