Skip to content

Commit d6380a6

Browse files
CLDSRV-734: Revert back from go to python supervisord
This will fix fluent-bit access to s3 log files The go version is not a perfect replacement it has multiple changes that would require to update supervisor conf. Breaking changes includes: - log files name changes - process number starts count at 1 instead of 0 - include full process_name with number in logfile - s3_1-1.log instead of s3-0.log - no supervisorctl, replaced by superivsord ctl with less option - no interactive supervisor ctl, if used without command it rewrite the superivsord.sock and then we lose access to supervisord ctl - replaced priority with depends_on - replaced %(ENV_X)s with envFiles Overrall we’d like to avoid breaking changes until we resolve correct usage of the go version and apply it in every component at once.
1 parent 23fc025 commit d6380a6

1 file changed

Lines changed: 4 additions & 9 deletions

File tree

images/federation/Dockerfile

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
ARG CLOUDSERVER_VERSION=latest
22
FROM ghcr.io/scality/cloudserver:${CLOUDSERVER_VERSION} AS builder
33

4-
####################################################################################################
5-
FROM ghcr.io/scality/cloudserver:${CLOUDSERVER_VERSION} AS supervisord
6-
7-
ARG SUPERVISORD_VERSION=0.7.3
8-
ADD https://github.com/ochinchina/supervisord/releases/download/v${SUPERVISORD_VERSION}/supervisord_${SUPERVISORD_VERSION}_Linux_64-bit.tar.gz /tmp/supervisord.tar.gz
9-
RUN tar -xzvf /tmp/supervisord.tar.gz -C /usr/local/bin --strip-components 1 --wildcards '*/supervisord'
10-
114
####################################################################################################
125
FROM ghcr.io/scality/cloudserver:${CLOUDSERVER_VERSION}
136

14-
# Install external dependencies
15-
COPY --from=supervisord /usr/local/bin/supervisord /usr/local/bin/
7+
RUN apt-get update \
8+
&& apt-get install -y --no-install-recommends \
9+
supervisor \
10+
&& rm -rf /var/lib/apt/lists/*
1611

1712
# Prepare runtime environment
1813
ENV USER="scality"

0 commit comments

Comments
 (0)