Example: fixed mismatch between install dirs and DIRs in example.xml.in

Docker: Removed example from test container, fixed example container
This commit is contained in:
Olof hagsand 2023-02-22 22:52:44 +01:00
parent a8c4e8699c
commit 2db5961169
8 changed files with 14 additions and 58 deletions

View file

@ -88,11 +88,8 @@ WORKDIR /clixon/clixon/util
RUN make
RUN make install
# Build and install the clixon example
WORKDIR /clixon/clixon/example/main
RUN make
RUN make install
RUN install example.xml /clixon/build/etc/clixon.xml
# Copy tests
WORKDIR /clixon/clixon/test

View file

@ -57,7 +57,6 @@ SPORT=${SPORT:-8443}
# Initial running datastore content (other than empty)
STORE=${STORE:-}
CONFIG0=$(cat <<EOF
<clixon-config xmlns="http://clicon.org/config">
<CLICON_CONFIGFILE>/usr/local/etc/example.xml</CLICON_CONFIGFILE>
@ -84,8 +83,8 @@ EOF
CONFIG=${CONFIG:-$CONFIG0}
# Start clixon-example backend
>&2 echo -n "Starting Backend..."
# Create clixon-test container
>&2 echo -n "Starting Container..."
sudo docker run -p $PORT:80 -p $SPORT:443 --name clixon-test --rm -e DBG=$DBG -e CONFIG="$CONFIG" -e STORE="$STORE" -td clixon/clixon-test || err "Error starting clixon-test"
# Wait for snmpd to start

View file

@ -78,9 +78,7 @@ echo "Set disable_coredump false" > /etc/sudo.conf
chmod 775 /usr/local/bin/test/site.sh
# Start clixon backend (tests will kill this)
/usr/local/sbin/clixon_backend -D $DBG -s running -l e # logs on docker logs
>&2 echo "clixon_backend started"
# No backend is started since tests dont require it
# Start snmpd, we need this for the SNMP tests and the app clixon_snmp. Log to stdout, then we can
# use Docker logs to see what's happening.