Skip to content

Commit

Permalink
remove supervisord (#1088)
Browse files Browse the repository at this point in the history
  • Loading branch information
mechanical-turk authored Sep 17, 2024
1 parent a454f0f commit 39c372d
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 45 deletions.
6 changes: 1 addition & 5 deletions core/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,10 @@ LABEL org.opencontainers.image.title="River Node" \
org.opencontainers.image.licenses="MIT"

# Install dependencies
RUN apk add --no-cache libcap supervisor curl && \
RUN apk add --no-cache libcap curl && \
adduser -D riveruser

COPY docker/run.sh /etc/run.sh
COPY docker/full_node.supervisord.conf /etc/full_node.supervisord.conf
COPY docker/archive_node.supervisord.conf /etc/archive_node.supervisord.conf
COPY --from=builder /bin/river_node /usr/bin/river_node

# Use setcap to allow the web server binary to bind to privileged ports
Expand All @@ -44,9 +42,7 @@ RUN setcap 'cap_net_bind_service=+ep' /usr/bin/river_node
COPY --from=builder /build/node/default_config.yaml /riveruser/river_node/config/config.yaml

RUN mkdir -p /riveruser/river_node/logs
RUN mkdir -p /riveruser/supervisord/logs
RUN chown riveruser:riveruser /riveruser/river_node/logs
RUN chown riveruser:riveruser /riveruser/supervisord/logs

# Set non-root user
USER riveruser
Expand Down
18 changes: 0 additions & 18 deletions core/docker/archive_node.supervisord.conf

This file was deleted.

2 changes: 0 additions & 2 deletions core/docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ services:
# image: public.ecr.aws/h5v6m2x1/river:latest
build:
dockerfile: ../Dockerfile
volumes:
- ./local_river_node_logs:/riveruser/river_node/logs
environment:
- BASECHAIN__CHAINID=31337
- STORAGE_TYPE=postgres
Expand Down
18 changes: 0 additions & 18 deletions core/docker/full_node.supervisord.conf

This file was deleted.

4 changes: 2 additions & 2 deletions core/docker/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ fi

if [ "$RUN_MODE" == "full" ]; then
echo "Running full node"
exec /usr/bin/supervisord -c /etc/full_node.supervisord.conf
exec /usr/bin/river_node run
elif [ "$RUN_MODE" == "archive" ]; then
echo "Running archive node"
exec /usr/bin/supervisord -c /etc/archive_node.supervisord.conf
exec /usr/bin/river_node archive
else
echo "Unknown RUN_MODE: $RUN_MODE"
exit 1
Expand Down

0 comments on commit 39c372d

Please sign in to comment.