Skip to content

Commit

Permalink
simplify sproxyd deployment
Browse files Browse the repository at this point in the history
Launching sproxyd directly without supervisord or an nginx proxy

Issue: BB-496
  • Loading branch information
Kerkesni committed Feb 11, 2025
1 parent 249310f commit eb563b7
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 130 deletions.
9 changes: 2 additions & 7 deletions .github/dockerfiles/e2e/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,8 @@ services:
build:
context: ../sproxyd
user: 0:0
privileged: true
healthcheck:
test: curl http://localhost:8181 || exit 1
interval: 10s
timeout: 30s
retries: 12
start_period: 10s
entrypoint: /usr/bin/sproxyd
command: -dlw -Vinfo -c /conf/sproxyd.conf -P /run/sproxyd-0 --no-sysfs
metadata:
profiles: ['s3c']
image: ${METADATA_IMAGE}
Expand Down
8 changes: 6 additions & 2 deletions .github/dockerfiles/sproxyd/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
ARG SPROXYD_VERSION=7.10.6.8
ARG SPROXYD_VERSION=7.10.11.0

FROM ghcr.io/scality/federation/sproxyd:${SPROXYD_VERSION}

ADD ./conf /conf/
ADD ./sproxyd.conf /conf/sproxyd.conf

RUN chown root:root /conf/sproxyd.conf

RUN mkdir /var/run/scality/

RUN touch /var/run/scality/scality-sproxyd-adminapi
26 changes: 0 additions & 26 deletions .github/dockerfiles/sproxyd/conf/fastcgi_params

This file was deleted.

51 changes: 0 additions & 51 deletions .github/dockerfiles/sproxyd/conf/nginx.conf

This file was deleted.

43 changes: 0 additions & 43 deletions .github/dockerfiles/sproxyd/conf/supervisord.conf

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"max_proc_fd": 40960,
"n_workers": 100,
"n_responders": 100,
"port": 20000,
"port": 8181,
"split_chunk_size": 33554432,
"split_control_by_request": false,
"split_enabled": true,
Expand Down

0 comments on commit eb563b7

Please sign in to comment.