From 586c748d44aacdaad3273240a52d33ee3427dc08 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Sun, 31 Oct 2021 13:07:10 +0800 Subject: [PATCH] vite build on host machine, since it is very slow on armv7/arm64 build --- .dockerignore | 1 - CONTRIBUTING.md | 5 +++-- docker/dockerfile | 6 +++--- docker/dockerfile-alpine | 5 ++--- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.dockerignore b/.dockerignore index 6e11b36b9..4a63437a4 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,5 +1,4 @@ /.idea -/dist /node_modules /data /out diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c9f186df2..b2efe3e09 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -226,10 +226,11 @@ https://github.com/louislam/uptime-kuma/issues?q=sort%3Aupdated-desc 1. Draft a release note 1. Make sure the repo is cleared 1. `npm run update-version 1.X.X` +1. `npm run build` 1. `npm run build-docker` -1. git push +1. `git push` 1. Publish the release note as 1.X.X -1. npm run upload-artifacts +1. `npm run upload-artifacts` 1. SSH to demo site server and update to 1.X.X Checking: diff --git a/docker/dockerfile b/docker/dockerfile index e2a3725fa..efbbfe6f2 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -4,9 +4,7 @@ WORKDIR /app ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 COPY . . -RUN npm ci && \ - npm run build && \ - npm ci --production && \ +RUN npm ci --production && \ chmod +x /app/extra/entrypoint.sh @@ -22,9 +20,11 @@ HEALTHCHECK --interval=60s --timeout=30s --start-period=180s --retries=5 CMD nod ENTRYPOINT ["/usr/bin/dumb-init", "--", "extra/entrypoint.sh"] CMD ["node", "server/server.js"] + FROM release AS nightly RUN npm run mark-as-nightly + # Upload the artifact to Github FROM louislam/uptime-kuma:base-debian AS upload-artifact WORKDIR / diff --git a/docker/dockerfile-alpine b/docker/dockerfile-alpine index e883031ae..ab9255f95 100644 --- a/docker/dockerfile-alpine +++ b/docker/dockerfile-alpine @@ -4,9 +4,7 @@ WORKDIR /app ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1 COPY . . -RUN npm ci && \ - npm run build && \ - npm ci --production && \ +RUN npm ci --production && \ chmod +x /app/extra/entrypoint.sh @@ -22,5 +20,6 @@ HEALTHCHECK --interval=60s --timeout=30s --start-period=180s --retries=5 CMD nod ENTRYPOINT ["/usr/bin/dumb-init", "--", "extra/entrypoint.sh"] CMD ["node", "server/server.js"] + FROM release AS nightly RUN npm run mark-as-nightly