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

Test: Added expect to Dockerfile and made sure pagination test worked in docker

Browse source
This commit is contained in:
Olof hagsand 2022-03-14 14:17:32 +01:00
parent e0f5472161
commit 159ac0a2d7
6 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docker/main/Dockerfile
View file

@ -85,6 +85,7 @@ RUN install example.xml /clixon/build/etc/clixon.xml
WORKDIR /clixon/clixon/test
RUN install -d /clixon/build/bin/test
RUN install *.sh /clixon/build/bin/test
RUN install *.exp /clixon/build/bin/test
# Copy startscript
WORKDIR /clixon
@ -101,7 +102,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 # iproute2 # contains ip
RUN apk add --update sudo curl procps grep make bash expect
# Create clicon user and group
RUN adduser -D -H clicon

3
docker/main/Dockerfile.fcgi
View file

@ -96,6 +96,7 @@ RUN install example.xml /clixon/build/etc/clixon.xml
WORKDIR /clixon/clixon/test
RUN install -d /clixon/build/bin/test
RUN install *.sh /clixon/build/bin/test
RUN install *.exp /clixon/build/bin/test
# Copy startscript
WORKDIR /clixon
@ -117,7 +118,7 @@ RUN adduser -D -H -G www-data www-data
RUN apk add --update nginx
# Test-specific (for test scripts)
RUN apk add --update sudo curl procps grep make bash # iproute2 # contains ip
RUN apk add --update sudo curl procps grep make bash expect
# Expose nginx port for restconf
EXPOSE 80

3
docker/main/Dockerfile.native
View file

@ -108,6 +108,7 @@ RUN install example.xml /clixon/build/etc/clixon.xml
WORKDIR /clixon/clixon/test
RUN install -d /clixon/build/bin/test
RUN install *.sh /clixon/build/bin/test
RUN install *.exp /clixon/build/bin/test
# Copy startscript
WORKDIR /clixon
@ -132,7 +133,7 @@ RUN apk add --update openssl
RUN apk add --update nghttp2
# Test-specific (for test scripts)
RUN apk add --update sudo curl procps grep make bash # iproute2 # contains ip - but CAP_SYS_ADMIN isssue
RUN apk add --update sudo curl procps grep make bash expect
# Expose https port for restconf
EXPOSE 80/tcp