Update docker to run river_node in combined mode (#714)

issue #532

core/Dockerfile

@@ -41,14 +41,11 @@ COPY --from=builder /bin/river_node /usr/bin/river_node
 # Use setcap to allow the web server binary to bind to privileged ports
 RUN setcap 'cap_net_bind_service=+ep' /usr/bin/river_node
 
-COPY --from=builder /build/node/default_config.yaml /riveruser/stream_node/config/config.yaml
-COPY --from=builder /build/node/default_config.yaml /riveruser/xchain_node/config/config.yaml
+COPY --from=builder /build/node/default_config.yaml /riveruser/river_node/config/config.yaml
 
-RUN mkdir -p /riveruser/stream_node/logs
-RUN mkdir -p /riveruser/xchain_node/logs
+RUN mkdir -p /riveruser/river_node/logs
 RUN mkdir -p /riveruser/supervisord/logs
-RUN chown riveruser:riveruser /riveruser/stream_node/logs
-RUN chown riveruser:riveruser /riveruser/xchain_node/logs
+RUN chown riveruser:riveruser /riveruser/river_node/logs
 RUN chown riveruser:riveruser /riveruser/supervisord/logs
 
 # Set non-root user

core/docker/full_node.supervisord.conf

@@ -6,20 +6,9 @@ loglevel=info
 logfile=/dev/stdout
 logfile_maxbytes=0
 
-[program:stream_node]
-command=/usr/bin/river_node run stream
-directory=/riveruser/stream_node
-autostart=true
-autorestart=false
-user=riveruser
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-
-[program:xchain_node]
-command=/usr/bin/river_node run xchain
-directory=/riveruser/xchain_node
+[program:river_node]
+command=/usr/bin/river_node run
+directory=/riveruser/river_node
 autostart=true
 autorestart=false
 user=riveruser