Skip to content

Commit 12b963f

Browse files
author
Kerkesni
committed
simplify sproxyd deployment
Launching sproxyd directly without supervisord or an nginx proxy Issue: BB-496
1 parent 79b1d4a commit 12b963f

File tree

6 files changed

+9
-130
lines changed

6 files changed

+9
-130
lines changed

.github/dockerfiles/e2e/docker-compose.yaml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,8 @@ services:
44
build:
55
context: ../sproxyd
66
user: 0:0
7-
privileged: true
8-
healthcheck:
9-
test: curl http://localhost:8181 || exit 1
10-
interval: 10s
11-
timeout: 30s
12-
retries: 12
13-
start_period: 10s
7+
entrypoint: /usr/bin/sproxyd
8+
command: -dlw -Vinfo -c /conf/sproxyd.conf -P /run/sproxyd-0 --no-sysfs
149
metadata:
1510
profiles: ['s3c']
1611
image: ${METADATA_IMAGE}
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
ARG SPROXYD_VERSION=7.10.6.8
1+
ARG SPROXYD_VERSION=7.10.11.0
22

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

5-
ADD ./conf /conf/
5+
ADD ./sproxyd.conf /conf/sproxyd.conf
66

77
RUN chown root:root /conf/sproxyd.conf
8+
9+
RUN mkdir /var/run/scality/
10+
11+
RUN touch /var/run/scality/scality-sproxyd-adminapi

.github/dockerfiles/sproxyd/conf/fastcgi_params

Lines changed: 0 additions & 26 deletions
This file was deleted.

.github/dockerfiles/sproxyd/conf/nginx.conf

Lines changed: 0 additions & 51 deletions
This file was deleted.

.github/dockerfiles/sproxyd/conf/supervisord.conf

Lines changed: 0 additions & 43 deletions
This file was deleted.

.github/dockerfiles/sproxyd/conf/sproxyd.conf renamed to .github/dockerfiles/sproxyd/sproxyd.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"max_proc_fd": 40960,
99
"n_workers": 100,
1010
"n_responders": 100,
11-
"port": 20000,
11+
"port": 8181,
1212
"split_chunk_size": 33554432,
1313
"split_control_by_request": false,
1414
"split_enabled": true,

0 commit comments

Comments
 (0)