Dockerfile +page vite

Dockerfile

@@ -26,6 +26,7 @@ RUN --mount=type=cache,id=pnpm,target=/pnpm/store pnpm install --prod --frozen-l
 FROM init AS builder
 ARG COMMIT_SHA
 WORKDIR /app
+ENV NODE_ENV production
 COPY --from=deps /app/node_modules ./node_modules
 COPY package.json tsconfig.json svelte.config.js vite.config.js ./
 COPY ./static ./static
@@ -37,15 +38,8 @@ RUN pnpm sync && \
 
 
 FROM init AS base
-
-# ENV PUID="1001" PGID="1001" PORT="5173" BODY_SIZE_LIMIT="52428800"
-#
-# RUN addgroup --system --gid ${PGID} nodejs
-# RUN adduser --system --uid ${PUID} -G nodejs -h /home/nodejs -s /bin/bash nodejs
-
 WORKDIR /app
 ENV NODE_ENV production
-
 COPY --from=modules --chown=nodejs:nodejs /app/node_modules ./node_modules
 COPY --from=builder --chown=nodejs:nodejs /app/.svelte-kit ./.svelte-kit
 COPY --from=builder --chown=nodejs:nodejs /app/package.json ./
@@ -55,9 +49,13 @@ COPY --from=builder /app/cherry /usr/local/bin/cherry
 
 FROM --platform=${TARGETPLATFORM:-linux/amd64} node:20-bookworm-slim
 ARG S6_OVERLAY_VERSION=3.1.6.2
-
 RUN apt-get update && \
-  apt-get install -y nginx libnginx-mod-http-brotli-static libnginx-mod-http-brotli-filter xz-utils procps sqlite3
+  apt-get install -y nginx \
+    libnginx-mod-http-brotli-static \
+    libnginx-mod-http-brotli-filter \
+    xz-utils \
+    procps \
+    sqlite3
 
 ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp
 RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz
@@ -71,8 +69,8 @@ ENV PUID="1001" PGID="1001" PORT="5173" BODY_SIZE_LIMIT="52428800"
 RUN addgroup --gid ${PGID} nodejs
 RUN adduser --uid ${PUID} --gid ${PGID} --home /home/nodejs --shell /bin/bash nodejs
 
-ENV NODE_ENV production
 WORKDIR /app
+ENV NODE_ENV production
 COPY --from=base --chown=nodejs:nodejs /app/ /app/
 COPY --from=base /usr/local/bin/cherry /usr/local/bin/cherry
 COPY --from=ghcr.io/haishanh/sqlite-simple-tokenizer:main --chown=nodejs:nodejs /libsimple.so /app/db/libsimple.so

src/routes/settings/about/+page.svelte

@@ -12,7 +12,7 @@
 
 <Cherry />
 <p>
-  🍒 Cherry version: <code>{version}</code>
+  Cherry version: <code>{version}</code>
   {#if sha}
     <span /><ExternalLink href={REPO_URL + `/tree/${sha}`}><code>{sha}</code></ExternalLink>
   {/if}

vite.config.js.timestamp-1712932493948-a4b5358a9f65d.mjs

@@ -0,0 +1,22 @@
+// vite.config.js
+import { sveltekit } from "file:///Users/HHan13/repo/h/cherry-priv/node_modules/.pnpm/@[email protected]_@[email protected][email protected][email protected]/node_modules/@sveltejs/kit/src/exports/vite/index.js";
+import { defineConfig } from "file:///Users/HHan13/repo/h/cherry-priv/node_modules/.pnpm/[email protected][email protected]/node_modules/vite/dist/node/index.js";
+
+// package.json
+var version = "0.0.7";
+
+// vite.config.js
+var vite_config_default = defineConfig(async () => {
+  const hash = process.env.COMMIT_SHA || "";
+  return {
+    define: {
+      __VERSION__: JSON.stringify(version),
+      __COMMIT_SHA__: JSON.stringify(hash)
+    },
+    plugins: [sveltekit()]
+  };
+});
+export {
+  vite_config_default as default
+};
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsidml0ZS5jb25maWcuanMiLCAicGFja2FnZS5qc29uIl0sCiAgInNvdXJjZXNDb250ZW50IjogWyJjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZGlybmFtZSA9IFwiL1VzZXJzL0hIYW4xMy9yZXBvL2gvY2hlcnJ5LXByaXZcIjtjb25zdCBfX3ZpdGVfaW5qZWN0ZWRfb3JpZ2luYWxfZmlsZW5hbWUgPSBcIi9Vc2Vycy9ISGFuMTMvcmVwby9oL2NoZXJyeS1wcml2L3ZpdGUuY29uZmlnLmpzXCI7Y29uc3QgX192aXRlX2luamVjdGVkX29yaWdpbmFsX2ltcG9ydF9tZXRhX3VybCA9IFwiZmlsZTovLy9Vc2Vycy9ISGFuMTMvcmVwby9oL2NoZXJyeS1wcml2L3ZpdGUuY29uZmlnLmpzXCI7aW1wb3J0IHsgc3ZlbHRla2l0IH0gZnJvbSAnQHN2ZWx0ZWpzL2tpdC92aXRlJztcbmltcG9ydCB7IGRlZmluZUNvbmZpZyB9IGZyb20gJ3ZpdGUnO1xuXG5pbXBvcnQgKiBhcyBwa2cgZnJvbSAnLi9wYWNrYWdlLmpzb24nO1xuXG5leHBvcnQgZGVmYXVsdCBkZWZpbmVDb25maWcoYXN5bmMgKCkgPT4ge1xuICBjb25zdCBoYXNoID0gcHJvY2Vzcy5lbnYuQ09NTUlUX1NIQSB8fCAnJztcbiAgLyoqIEB0eXBlIHtpbXBvcnQoJ3ZpdGUnKS5Vc2VyQ29uZmlnfSAqL1xuICByZXR1cm4ge1xuICAgIGRlZmluZToge1xuICAgICAgX19WRVJTSU9OX186IEpTT04uc3RyaW5naWZ5KHBrZy52ZXJzaW9uKSxcbiAgICAgIF9fQ09NTUlUX1NIQV9fOiBKU09OLnN0cmluZ2lmeShoYXNoKSxcbiAgICB9LFxuICAgIHBsdWdpbnM6IFtzdmVsdGVraXQoKV0sXG4gIH07XG59KTtcbiIsICJ7XG4gIFwibmFtZVwiOiBcImNoZXJyeVwiLFxuICBcInZlcnNpb25cIjogXCIwLjAuN1wiLFxuICBcInByaXZhdGVcIjogdHJ1ZSxcbiAgXCJsaWNlbnNlXCI6IFwiVU5MSUNFTlNFRFwiLFxuICBcInByZXR0aWVyXCI6IHtcbiAgICBcInByaW50V2lkdGhcIjogMTIwLFxuICAgIFwic2luZ2xlUXVvdGVcIjogdHJ1ZSxcbiAgICBcInBsdWdpbnNcIjogW1xuICAgICAgXCJwcmV0dGllci1wbHVnaW4tc3ZlbHRlXCJcbiAgICBdXG4gIH0sXG4gIFwiYnJvd3NlcnNsaXN0XCI6IFtcbiAgICBcImRlZmF1bHRzXCJcbiAgXSxcbiAgXCJzY3JpcHRzXCI6IHtcbiAgICBcImRldlwiOiBcInZpdGUgZGV2XCIsXG4gICAgXCJ0ZXN0XCI6IFwiTk9ERV9PUFRJT05TPSctLWltcG9ydCB0c3gnIHV2dSBzcmMgLnRlc3QudHNcIixcbiAgICBcImRvXCI6IFwiTk9ERV9PUFRJT05TPSctLWltcG9ydCB0c3gnIG5vZGVcIixcbiAgICBcInRlc3Q6MVwiOiBcInV2dSAtciBlc2J1aWxkLXJlZ2lzdGVyIC1yIHRzY29uZmlnLXBhdGhzL3JlZ2lzdGVyXCIsXG4gICAgXCJidWlsZFwiOiBcInZpdGUgYnVpbGRcIixcbiAgICBcInByZXZpZXdcIjogXCJ2aXRlIHByZXZpZXdcIixcbiAgICBcInBhY2thZ2VcIjogXCJzdmVsdGUtcGFja2FnZVwiLFxuICAgIFwic3luY1wiOiBcInN2ZWx0ZS1raXQgc3luY1wiLFxuICAgIFwiY2hlY2tcIjogXCJzdmVsdGUtY2hlY2sgLS10c2NvbmZpZyAuL3RzY29uZmlnLmpzb25cIixcbiAgICBcImNoZWNrOndhdGNoXCI6IFwic3ZlbHRlLWNoZWNrIC0tdHNjb25maWcgLi90c2NvbmZpZy5qc29uIC0td2F0Y2hcIixcbiAgICBcImJ1bmRsZTpjbGlcIjogXCJlc2J1aWxkIHNyYy9jbGkvaW5kZXgudHMgLS1idW5kbGUgLS1taW5pZnkgLS1wbGF0Zm9ybT1ub2RlIC0tdGFyZ2V0PW5vZGUxNiAtLW91dGZpbGU9Y2hlcnJ5XCIsXG4gICAgXCJjaGVycnlcIjogXCJ0c3ggc3JjL2NsaS9pbmRleC50c1wiLFxuICAgIFwibGludFwiOiBcInByZXR0aWVyIC0tY2hlY2sgc3JjIHNjcmlwdHMgJiYgZXNsaW50IC0tY2FjaGUgc3JjXCIsXG4gICAgXCJsaW50OmZpeFwiOiBcImVzbGludCAtLWNhY2hlIC0tZml4IHNyY1wiLFxuICAgIFwicHJldHRpZXI6Zml4XCI6IFwicHJldHRpZXIgLS13cml0ZSBzcmMgc2NyaXB0c1wiLFxuICAgIFwiZml4XCI6IFwicG5wbSBsaW50OmZpeCAmJiBwbnBtIHByZXR0aWVyOmZpeFwiXG4gIH0sXG4gIFwiZGV2RGVwZW5kZW5jaWVzXCI6IHtcbiAgICBcIkBicm93c2VyLWxvZ29zL2Nocm9tZVwiOiBcIjIuMC4wXCIsXG4gICAgXCJAYnJvd3Nlci1sb2dvcy9maXJlZm94XCI6IFwiMy4wLjEwXCIsXG4gICAgXCJAYnJvd3Nlci1sb2dvcy9zYWZhcmlcIjogXCIyLjEuMFwiLFxuICAgIFwiQGZvbnRzb3VyY2UvaW50ZXJcIjogXCI1LjAuMTdcIixcbiAgICBcIkBoc2pzL3N2ZWx0ZS1pY29uc1wiOiBcIjAuMC4xLXJjLjRcIixcbiAgICBcIkBzdmVsdGVqcy9hZGFwdGVyLW5vZGVcIjogXCI1LjAuMVwiLFxuICAgIFwiQHN2ZWx0ZWpzL2tpdFwiOiBcIjIuNS41XCIsXG4gICAgXCJAc3ZlbHRlanMvcGFja2FnZVwiOiBcIjIuMy4xXCIsXG4gICAgXCJAc3ZlbHRlanMvdml0ZS1wbHVnaW4tc3ZlbHRlXCI6IFwiMy4xLjBcIixcbiAgICBcIkB0eXBlcy9iZXR0ZXItc3FsaXRlM1wiOiBcIjcuNi45XCIsXG4gICAgXCJAdHlwZXMvZGVidWdcIjogXCI0LjEuMTJcIixcbiAgICBcIkB0eXBlcy9lc3RyZWVcIjogXCIxLjAuNVwiLFxuICAgIFwiQHR5cGVzL3RhclwiOiBcIjYuMS4xMlwiLFxuICAgIFwiQHR5cGVzY3JpcHQtZXNsaW50L2VzbGludC1wbHVnaW5cIjogXCI3LjQuMFwiLFxuICAgIFwiQHR5cGVzY3JpcHQtZXNsaW50L3BhcnNlclwiOiBcIjcuNC4wXCIsXG4gICAgXCJhdXRvcHJlZml4ZXJcIjogXCIxMC40LjE5XCIsXG4gICAgXCJkb21oYW5kbGVyXCI6IFwiNS4wLjNcIixcbiAgICBcImVzYnVpbGRcIjogXCIwLjIwLjJcIixcbiAgICBcImVzYnVpbGQtcmVnaXN0ZXJcIjogXCIzLjUuMFwiLFxuICAgIFwiZXNsaW50XCI6IFwiOC41Ny4wXCIsXG4gICAgXCJlc2xpbnQtY29uZmlnLXByZXR0aWVyXCI6IFwiOS4xLjBcIixcbiAgICBcImVzbGludC1wbHVnaW4tcHJldHRpZXJcIjogXCI1LjEuM1wiLFxuICAgIFwiZXNsaW50LXBsdWdpbi1zaW1wbGUtaW1wb3J0LXNvcnRcIjogXCIxMi4wLjBcIixcbiAgICBcImVzbGludC1wbHVnaW4tc3ZlbHRlXCI6IFwiMi4zNS4xXCIsXG4gICAgXCJuYW5vaWRcIjogXCI1LjAuN1wiLFxuICAgIFwicG9zdGNzc1wiOiBcIjguNC4zOFwiLFxuICAgIFwicHJldHRpZXJcIjogXCIzLjIuNVwiLFxuICAgIFwicHJldHRpZXItcGx1Z2luLXN2ZWx0ZVwiOiBcIjMuMi4yXCIsXG4gICAgXCJzYWRlXCI6IFwiMS44LjFcIixcbiAgICBcInNhc3NcIjogXCIxLjc1LjBcIixcbiAgICBcInN2ZWx0ZVwiOiBcIjQuMi4xM1wiLFxuICAgIFwic3ZlbHRlLWNoZWNrXCI6IFwiMy42LjlcIixcbiAgICBcInN2ZWx0ZS1maWxlLWRyb3B6b25lXCI6IFwiMi4wLjdcIixcbiAgICBcInRpbnktaW52YXJpYW50XCI6IFwiMS4zLjNcIixcbiAgICBcInRzY29uZmlnLXBhdGhzXCI6IFwiNC4yLjBcIixcbiAgICBcInRzbGliXCI6IFwiMi42LjJcIixcbiAgICBcInRzeFwiOiBcIjQuNy4yXCIsXG4gICAgXCJ0eXBlc2NyaXB0XCI6IFwiNS40LjVcIixcbiAgICBcInVuZGljaVwiOiBcIjYuMTMuMFwiLFxuICAgIFwidXZ1XCI6IFwiMC41LjZcIixcbiAgICBcInZpdGVcIjogXCI1LjIuOFwiXG4gIH0sXG4gIFwidHlwZVwiOiBcIm1vZHVsZVwiLFxuICBcImRlcGVuZGVuY2llc1wiOiB7XG4gICAgXCJAYXdzLXNkay9jbGllbnQtczNcIjogXCIzLjU1NC4wXCIsXG4gICAgXCJAbm9kZS1ycy9hcmdvbjJcIjogXCIxLjguMFwiLFxuICAgIFwiQG5vZGUtcnMvY3JjMzJcIjogXCIxLjEwLjBcIixcbiAgICBcImJldHRlci1zcWxpdGUzXCI6IFwiOS41LjBcIixcbiAgICBcImNzdi1zdHJpbmdpZnlcIjogXCI2LjQuNlwiLFxuICAgIFwiZGF0ZS1mbnNcIjogXCIzLjYuMFwiLFxuICAgIFwiZGVidWdcIjogXCI0LjMuNFwiLFxuICAgIFwiZG90ZW52XCI6IFwiMTYuNC41XCIsXG4gICAgXCJodG1sLW1ldGFkYXRhLXBhcnNlclwiOiBcIjIuMC40XCIsXG4gICAgXCJodG1scGFyc2VyMlwiOiBcIjkuMS4wXCIsXG4gICAgXCJ0YXJcIjogXCI3LjAuMFwiLFxuICAgIFwiem9kXCI6IFwiMy4yMi40XCJcbiAgfVxufVxuIl0sCiAgIm1hcHBpbmdzIjogIjtBQUFrUixTQUFTLGlCQUFpQjtBQUM1UyxTQUFTLG9CQUFvQjs7O0FDQzNCLGNBQVc7OztBREdiLElBQU8sc0JBQVEsYUFBYSxZQUFZO0FBQ3RDLFFBQU0sT0FBTyxRQUFRLElBQUksY0FBYztBQUV2QyxTQUFPO0FBQUEsSUFDTCxRQUFRO0FBQUEsTUFDTixhQUFhLEtBQUssVUFBYyxPQUFPO0FBQUEsTUFDdkMsZ0JBQWdCLEtBQUssVUFBVSxJQUFJO0FBQUEsSUFDckM7QUFBQSxJQUNBLFNBQVMsQ0FBQyxVQUFVLENBQUM7QUFBQSxFQUN2QjtBQUNGLENBQUM7IiwKICAibmFtZXMiOiBbXQp9Cg==