fix: use supervisor to fix zombie process #101 #98

docker-bw-init.sh → .github/docker/docker-bw-init.sh

@@ -78,6 +78,4 @@ create_authorized_keys_file
 check_repos_directory
 get_SSH_fingerprints
 
-sudo service ssh restart
-
-exec "$@"
+exec supervisord -c /home/borgwarehouse/app/supervisord.conf

.github/docker/supervisord.conf

@@ -0,0 +1,10 @@
+[supervisord]
+nodaemon=true
+logfile=/home/borgwarehouse/supervisord.log
+pidfile=/home/borgwarehouse/supervisord.pid
+
+[program:sshd]
+command=/usr/sbin/sshd -D
+
+[program:borgwarehouse]
+command=/usr/local/bin/node server.js

Dockerfile

@@ -27,11 +27,10 @@ FROM base AS runner
 ENV NODE_ENV production
 
 RUN apt-get update && apt-get install -y \
-    curl jq jc borgbackup openssh-server sudo && \
+    supervisor \
+    curl jq jc borgbackup openssh-server sudo cron && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN echo "borgwarehouse ALL=(ALL) NOPASSWD: /usr/sbin/service ssh restart" >> /etc/sudoers
-
 RUN groupadd borgwarehouse
 
 RUN useradd -m -g borgwarehouse borgwarehouse
@@ -45,11 +44,12 @@ COPY --from=builder --chown=borgwarehouse:borgwarehouse /app/helpers/shells ./he
 COPY --from=builder --chown=borgwarehouse:borgwarehouse /app/.next/standalone ./
 COPY --from=builder --chown=borgwarehouse:borgwarehouse /app/public ./public
 COPY --from=builder --chown=borgwarehouse:borgwarehouse /app/.next/static ./.next/static
+COPY --from=builder --chown=borgwarehouse:borgwarehouse /app/docker/supervisord.conf ./
 
 USER borgwarehouse
 
 EXPOSE 3000 22
 
-ENTRYPOINT ["./docker-bw-init.sh"]
+ENTRYPOINT ["./docker/docker-bw-init.sh"]
 
 CMD ["node", "server.js"]