cmd/storagenode: move supervisord config file to storagenode-base image

The supervisord.conf file is edited to set the args for the storagenode and storagenode-updater binaries at runtime. This change moves the config file to the base image so we can set the permission to allow non-root users edit the config file. Non-root user permission is also needed for the /app directory so we can install/update the binaries when run as a non-root user. Updates #4489 Change-Id: If7a51a00ea171253e41923501174a43393f4638c
storj · Mar 16, 2022 · 5a3047c · 5a3047c
1 parent bf8ed28
commit 5a3047c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/cmd/storagenode/Dockerfile.base b/cmd/storagenode/Dockerfile.base
@@ -2,4 +2,6 @@ ARG DOCKER_ARCH
 
 FROM ${DOCKER_ARCH:-amd64}/alpine:3.15
 RUN apk --no-cache -U add ca-certificates supervisor
-RUN mkdir -p /var/log/supervisor
+RUN mkdir -p /var/log/supervisor /app
+COPY cmd/storagenode/docker-base/ /
+RUN chmod a+rw /etc/supervisor/supervisord.conf /app
diff --git a/cmd/storagenode/docker/bin/stop-supervisor → ...oragenode/docker-base/bin/stop-supervisor b/cmd/storagenode/docker/bin/stop-supervisor → ...oragenode/docker-base/bin/stop-supervisor
diff --git a/cmd/storagenode/docker/etc/supervisord.conf → ...cker-base/etc/supervisor/supervisord.conf b/cmd/storagenode/docker/etc/supervisord.conf → ...cker-base/etc/supervisor/supervisord.conf
@@ -1,5 +1,4 @@
 [supervisord]
-user=root
 nodaemon=true
 logfile=/var/log/supervisor/supervisord.log
 pidfile=/run/supervisord.pid