docker: nginx install changed in alpine

docker/main/Dockerfile.fcgi

@@ -57,8 +57,8 @@ RUN mkdir /clixon/clixon
 WORKDIR /clixon/clixon
 COPY clixon .
 
-# Need to add www user manually
+# Need to add www user manually, but group www-data already exists on Alpine
-RUN adduser -D -H www-data
+RUN adduser -D -H -G www-data www-data
 # nginx adds group www-data
 RUN apk add --update nginx
 
@@ -97,8 +97,8 @@ MAINTAINER Olof Hagsand <olof@hagsand.se>
 # For clixon and cligen
 RUN apk add --update flex bison fcgi-dev
 
-# need to add www user manually
+# Need to add www user manually, but group www-data already exists on Alpine
-RUN adduser -D -H www-data
+RUN adduser -D -H -G www-data www-data
 # nginx adds group www-data
 RUN apk add --update nginx
 

docker/main/startsystem_fcgi.sh

@@ -54,7 +54,8 @@ echo "$STORE" > /usr/local/var/example/running_db
 
 >&2 echo "Write nginx config files"
 # nginx site config file
-cat <<EOF > /etc/nginx/conf.d/default.conf
+# Note alpine has switched between /etc/nginx/conf.d/ and /etc/nginx/http.d/
+cat <<EOF > /etc/nginx/http.d/default.conf
 #
 server {
         listen 80 default_server;
@@ -84,9 +85,11 @@ EOF
 # - all 3rd party model testing (you need to download the repos)
 # - test_install.sh since you dont have the make environment
 # - test_order.sh XXX this is a bug need debugging
+# Note use only http, for https you need to reconfig nginx
 cat <<EOF > /usr/local/bin/test/site.sh
 # Add your local site specific env variables (or tests) here.
 SKIPLIST="test_api.sh test_client.sh test_c++.sh test_install.sh test_privileges.sh"
+RCPROTO=http # Because nginx
 #IETFRFC=
 EOF
 

test/test_restconf_internal.sh

@@ -278,6 +278,8 @@ fi
 new "kill restconf using kill"
 stop_restconf_pre
 
+sleep $DEMSLEEP
+
 new "Wait for restconf to stop"
 wait_restconf_stopped