test

.github/workflows/build_docker_image.yml

@@ -7,6 +7,7 @@ on:
     branches:
       - "master"
       - "develop"
+      - "test-overlay"
     tags:
       - "v*"
   schedule:

docker/Dockerfile

@@ -76,7 +76,31 @@ COPY --from=builder /tmp/build/node_modules/. /ql/node_modules/
 
 WORKDIR ${QL_DIR}
 
+RUN apk --no-cache add -f s6-overlay
+# ENV S6_VERSION=v3.2.0.0
+
+# RUN ARCH=$(uname -m) && \
+#     case "$ARCH" in \
+#         x86_64) ARCH="amd64" ;; \
+#         aarch64) ARCH="aarch64" ;; \
+#         armv6l) ARCH="arm" ;; \
+#         armv7l) ARCH="armhf" ;; \
+#         i386) ARCH="x86" ;; \
+#         s390x) ARCH="s390x" ;; \
+#         ppc64le) ARCH="powerpc64le" ;; \
+#         *) echo "unsupported architecture"; exit 1 ;; \
+#     esac && \
+#     S6_OVERLAY_URL=https://github.com/just-containers/s6-overlay/releases/download/${S6_VERSION}/s6-overlay-${ARCH}.tar.xz && \
+#     apk add --no-cache curl && \
+#     curl -L $S6_OVERLAY_URL -o /tmp/s6-overlay.tar.xz && \
+#     tar -C / -Jxpf /tmp/s6-overlay.tar.xz
+
+COPY docker/s6-rc.d /etc/s6-overlay/s6-rc.d/
+
+RUN chmod +x /etc/s6-overlay/s6-rc.d/*/run && \
+    chmod +x /etc/s6-overlay/s6-rc.d/*/finish
+
 HEALTHCHECK --interval=5s --timeout=2s --retries=20 \
   CMD curl -sf --noproxy '*' http://127.0.0.1:5400/api/health || exit 1
 
-ENTRYPOINT ["./docker/docker-entrypoint.sh"]
+ENTRYPOINT ["/init"]

docker/s6-rc.d/crond/finish

@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "finish crond"

docker/s6-rc.d/crond/run

@@ -0,0 +1,2 @@
+#!/bin/bash
+crond -f

docker/s6-rc.d/crond/type

@@ -0,0 +1 @@
+longrun

docker/s6-rc.d/nginx/finish

@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "finish ngnix"

docker/s6-rc.d/nginx/run

@@ -0,0 +1,12 @@
+#!/bin/bash
+dir_shell=/ql/shell
+. $dir_shell/share.sh
+. $dir_shell/env.sh
+
+import_config "$@"
+make_dir /etc/nginx/conf.d
+make_dir /run/nginx
+init_nginx
+fix_config
+
+nginx -g "daemon off;"

docker/s6-rc.d/nginx/type

@@ -0,0 +1 @@
+longrun

docker/s6-rc.d/panel/finish

@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "finish panel"

docker/s6-rc.d/panel/run

@@ -0,0 +1,12 @@
+#!/bin/bash
+dir_shell=/ql/shell
+. $dir_shell/share.sh
+. $dir_shell/env.sh
+
+import_config "$@"
+make_dir /etc/nginx/conf.d
+make_dir /run/nginx
+init_nginx
+fix_config
+
+node ${dir_static}/build/app.js

docker/s6-rc.d/panel/type

@@ -0,0 +1 @@
+longrun

docker/s6-rc.d/publilc/finish

@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "finish public"

docker/s6-rc.d/publilc/run

@@ -0,0 +1,12 @@
+#!/bin/bash
+dir_shell=/ql/shell
+. $dir_shell/share.sh
+. $dir_shell/env.sh
+
+import_config "$@"
+make_dir /etc/nginx/conf.d
+make_dir /run/nginx
+init_nginx
+fix_config
+
+node ${dir_static}/build/public.js

docker/s6-rc.d/publilc/type

@@ -0,0 +1 @@
+longrun

docker/s6-rc.d/schedule/finish

@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "finish schedule"

docker/s6-rc.d/schedule/run

@@ -0,0 +1,12 @@
+#!/bin/bash
+dir_shell=/ql/shell
+. $dir_shell/share.sh
+. $dir_shell/env.sh
+
+import_config "$@"
+make_dir /etc/nginx/conf.d
+make_dir /run/nginx
+init_nginx
+fix_config
+
+node ${dir_static}/build/schedule/index.js

docker/s6-rc.d/schedule/type

@@ -0,0 +1 @@
+longrun

docker/s6-rc.d/update/finish

@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "finish update"

docker/s6-rc.d/update/run

@@ -0,0 +1,12 @@
+#!/bin/bash
+dir_shell=/ql/shell
+. $dir_shell/share.sh
+. $dir_shell/env.sh
+
+import_config "$@"
+make_dir /etc/nginx/conf.d
+make_dir /run/nginx
+init_nginx
+fix_config
+
+node ${dir_static}/build/update.js

docker/s6-rc.d/update/type

@@ -0,0 +1 @@
+longrun