~/Projects/uptime
git clone https://code.lsong.org/uptime
Commit
- Commit
- 586c748d44aacdaad3273240a52d33ee3427dc08
- Author
- Louis Lam <[email protected]>
- Date
- 2021-10-31 13:07:10 +0800 +0800
- Diffstat
.dockerignore | 1 -
CONTRIBUTING.md | 6 ++++--
docker/dockerfile | 5 +++--
docker/dockerfile-alpine | 5 ++---
vite build on host machine, since it is very slow on armv7/arm64 build
diff --git a/.dockerignore b/.dockerignore
index 6e11b36b9a9172ce2557f1feb4f227c92a60ea01..4a63437a4490cf54807f1c2cc9164a104c6a120c 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,4 @@
/.idea
-/dist
/node_modules
/data
/out
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c9f186df2ab2da1f655c22a26a5c3ca01eee8a3a..b2efe3e09874afbe475acbfe6bcf1791d6f0441f 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -227,12 +227,14 @@ 1. Draft a release note
1. Make sure the repo is cleared
1. `npm run update-version 1.X.X`
# Project Info
+#### ❌ Won't Merge
+# Project Info
- Add a chart
# Project Info
-- Fix a bug
+- Any breaking changes
1. Publish the release note as 1.X.X
# Project Info
-- Add a independent new feature
+- Duplicated pull request
1. SSH to demo site server and update to 1.X.X
Checking:
diff --git a/docker/dockerfile b/docker/dockerfile
index e2a3725fabbeabd4ce64674aa7f50c2d4c462664..efbbfe6f23de66d1175098013d06c5f60a6b872b 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -4,8 +4,7 @@
ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=1
COPY . .
-RUN npm ci && \
- npm run build && \
+
npm ci --production && \
chmod +x /app/extra/entrypoint.sh
@@ -22,8 +21,10 @@ HEALTHCHECK --interval=60s --timeout=30s --start-period=180s --retries=5 CMD node extra/healthcheck.js
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
diff --git a/docker/dockerfile-alpine b/docker/dockerfile-alpine
index e883031aecdbb3a2008a1a1a9eb9bd2a60f7ca8e..ab9255f95404fbb6d4a839ebedc1a4e2042fefc7 100644
--- a/docker/dockerfile-alpine
+++ b/docker/dockerfile-alpine
@@ -4,9 +4,7 @@
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
@@ -21,6 +19,7 @@ VOLUME ["/app/data"]
HEALTHCHECK --interval=60s --timeout=30s --start-period=180s --retries=5 CMD node extra/healthcheck.js
ENTRYPOINT ["/usr/bin/dumb-init", "--", "extra/entrypoint.sh"]
CMD ["node", "server/server.js"]
+
FROM release AS nightly
RUN npm run mark-as-nightly
