chore: 使用 s6-overlay 作为多进程管理服务

Dockerfile

@@ -47,7 +47,7 @@ RUN SECRET_TOKEN=precompile_placeholder bin/rails assets:precompile && \
     cp -r public/ new_public/
 
 # Remove folders not needed in resulting image
-RUN rm -rf node_modules tmp/cache spec .browserslistrc babel.config.js \
+RUN rm -rf docker node_modules tmp/cache spec .browserslistrc babel.config.js \
     package.json postcss.config.js yarn.lock
 
 ##################################################################################
@@ -63,9 +63,10 @@ ARG REPLACE_CHINA_MIRROR="true"
 ARG ORIGINAL_REPO_URL="http://dl-cdn.alpinelinux.org"
 ARG MIRROR_REPO_URL="https://mirrors.tuna.tsinghua.edu.cn"
 ARG RUBYGEMS_SOURCE="https://gems.ruby-china.com/"
-ARG PACKAGES="tzdata imagemagick imagemagick-dev postgresql-dev postgresql-client openssl openssl-dev"
+ARG PACKAGES="tzdata curl shadow logrotate imagemagick imagemagick-dev postgresql-dev postgresql-client openssl openssl-dev"
 ARG RUBY_GEMS="bundler"
 ARG APP_ROOT=/app
+ARG S6_OVERLAY_VERSION="2.0.0.1"
 
 LABEL im.ews.zealot.build-date=$BUILD_DATE \
       im.ews.zealot.vcs-ref=$VCS_REF \
@@ -77,11 +78,13 @@ LABEL im.ews.zealot.build-date=$BUILD_DATE \
       im.ews.zealot.maintaner="icyleaf <icyleaf.cn@gmail.com>"
 
 ENV TZ="Asia/Shanghai" \
+    PS1="$(whoami)@$(hostname):$(pwd)$ " \
     DOCKER_TAG="$TAG" \
     BUNDLE_APP_CONFIG="$APP_ROOT/.bundle" \
     ZEALOT_VCS_REF="$VCS_REF" \
     ZEALOT_VERSION="$ZEALOT_VERSION" \
-    RAILS_ENV="production"
+    RAILS_ENV="production" \
+    ENABLE_BOOTSNAP="false"
 
 # System dependencies
 RUN set -ex && \
@@ -92,18 +95,15 @@ RUN set -ex && \
       gem sources --add $RUBYGEMS_SOURCE --remove https://rubygems.org/; \
     fi && \
     apk --update --no-cache add $PACKAGES && \
-    cp /usr/share/zoneinfo/$TZ /etc/localtime && \
-    echo $TZ > /etc/timezone && \
+    curl -L -s https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-amd64.tar.gz | tar xvzf - -C / && \
     gem install $RUBY_GEMS && \
-    echo "0 */5 * * * /bin/sh -l -c 'find /tmp -type f -mmin +300 -exec rm -f {} \;' >> /var/log/clean_tmp_cron.log 2>&1" > /etc/crontabs/clean_tmp && \
-    chmod 0644 /etc/crontabs/clean_tmp && \
-    touch /var/log/clean_tmp_cron.log && \
-    crontab /etc/crontabs/clean_tmp
+    adduser -D -u 911 -g zealot -h /app -s /sbin/nologin zealot
 
 WORKDIR $APP_ROOT
 
+COPY docker/rootfs /
 COPY --from=builder $APP_ROOT $APP_ROOT
 
 EXPOSE 3000
 
-ENTRYPOINT [ "./docker-endpoint.sh" ]
+ENTRYPOINT ["/init"]

config/boot.rb

@@ -1,4 +1,9 @@
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 
 require 'bundler/setup' # Set up gems listed in the Gemfile.
-require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
+
+# Broken in docker image, need set it false
+# Ref: https://github.com/Shopify/bootsnap/issues/262
+if ENV.fetch('ENABLE_BOOTSNAP', 'true') == 'true'
+  require 'bootsnap/setup' # Speed up boot time by caching expensive operations.
+end

docker/rootfs/etc/cont-init.d/00-adduser

@@ -0,0 +1,16 @@
+#!/usr/bin/with-contenv sh
+
+PUID=${PUID:-911}
+PGID=${PGID:-911}
+
+groupmod -o -g "$PGID" zealot
+usermod -o -u "$PUID" zealot
+
+echo "
+-------------------------------------
+GID/UID
+-------------------------------------
+User uid:  $(id -u zealot)
+User gid:  $(id -g zealot)
+-------------------------------------
+"

docker/rootfs/etc/cont-init.d/01-set-timezone

@@ -0,0 +1,8 @@
+#!/usr/bin/with-contenv sh
+
+TZ=${TZ:-"Asia/Shanghai"}
+
+if [[ -f "/usr/share/zoneinfo/$TZ" ]]; then
+  ln -snf "/usr/share/zoneinfo/$TZ" /etc/localtime
+  echo "$TZ" > /etc/timezone
+fi

docker/rootfs/etc/cont-init.d/11-set-crontab

@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv sh
+
+touch /var/log/clean_tmp_cron.log
+crontab /etc/crontabs/clean_tmp

docker/rootfs/etc/cont-init.d/12-logrotate

@@ -0,0 +1,14 @@
+#!/usr/bin/with-contenv bash
+
+if [[ ! -f /mnt/config/etc/logrotate.conf ]]; then
+  if [[ ! -d /mnt/config/etc ]]; then
+    s6-setuidgid guardian mkdir -p /mnt/config/etc
+  fi
+
+  s6-setuidgid guardian cp /etc/logrotate.conf /mnt/config/etc/logrotate.conf
+fi
+
+if [[ ! -d /mnt/config/etc/logrotate.d ]]; then
+  s6-setuidgid guardian mkdir -p /mnt/config/etc/logrotate.d
+  s6-setuidgid guardian cp -n /etc/logrotate.d/* /mnt/config/etc/logrotate.d/
+fi

docker/rootfs/etc/cont-init.d/20-init-zealot

@@ -0,0 +1,25 @@
+#!/usr/bin/with-contenv sh
+
+cd /app
+
+# Clear pid if unexpected exception exit
+s6-setuidgid zealot rm -f tmp/pids/.pid
+s6-setuidgid zealot mkdir -p tmp/pids tmp/cache tmp/uploads tmp/sockets log
+
+# Updating assets
+if [ -d "new_public" ]; then
+  echo "Zealot updating public ..."
+  for x in public/*; do
+    if [ -z $(echo "$x" | grep uploads) ]; then
+      s6-setuidgid zealot rm -rf "$x"
+    fi
+  done
+
+  for x in new_public/*; do
+    if [ -z $(echo "$x" | grep uploads) ]; then
+      s6-setuidgid zealot mv "$x" "public"
+    fi
+  done
+
+  s6-setuidgid zealot rm -rf new_public
+fi

docker/rootfs/etc/cont-init.d/25-upgrade-zealot

@@ -0,0 +1,4 @@
+#!/usr/bin/with-contenv sh
+
+cd /app && ./bin/rails zealot:upgrade
+exit 0

docker/rootfs/etc/crontabs/clean_tmp

@@ -0,0 +1 @@
+0 */5 * * * /bin/sh -l -c 'find /tmp -type f -mmin +300 -exec rm -f {} \;' >> /var/log/clean_tmp_cron.log 2>&1

docker/rootfs/etc/fix-attrs.d/11-crontab-dir

@@ -0,0 +1 @@
+/etc/crontabs/clean_tmp false root:root 0644 0755

docker/rootfs/etc/fix-attrs.d/20-zealot-app-dir

@@ -0,0 +1,3 @@
+/app true zealot,911:911 0644 0755
+/app/bin true zealot,911:911 0755 0755
+/app/vendor true zealot,911:911 0755 0755

docker/rootfs/etc/logrotate.conf

@@ -0,0 +1,14 @@
+weekly
+rotate 4
+
+create
+dateext
+compress
+
+notifempty
+nomail
+noolddir
+
+tabooext + .apk-new
+
+include /etc/logrotate.d

docker/rootfs/etc/logrotate.d/crond-clean-tmp

@@ -0,0 +1,4 @@
+/var/log/clean_tmp_cron.log {
+  missingok
+  notifempty
+}

docker/rootfs/etc/logrotate.d/sidekiq

@@ -0,0 +1,5 @@
+/app/log/sidekiq.log {
+  missingok
+  notifempty
+  monthly
+}

docker/rootfs/etc/logrotate.d/zealot

@@ -0,0 +1,4 @@
+/app/log/zealot.log {
+  missingok
+  notifempty
+}

docker/rootfs/etc/services.d/crond/run

@@ -0,0 +1,3 @@
+#!/usr/bin/execlineb -P
+
+/usr/sbin/crond -fS

docker/rootfs/etc/services.d/sidekiq/run

@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv sh
+
+echo "Starting Zealot Worker"
+cd /app
+bundle exec sidekiq -C config/sidekiq.yml  | tee /app/log/sidekiq.log

docker/rootfs/etc/services.d/zealot/run

@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv sh
+
+echo "Starting Zealot"
+cd /app
+bundle exec puma -C config/puma.rb  | tee /app/log/zealot.log