Commit graph

29 commits

Author SHA1 Message Date
Louis Lam
852b3fa61b Merge branch '1.23.X'
# Conflicts:
#	package-lock.json
#	server/database.js
#	server/server.js
#	server/util-server.js
2023-10-09 21:28:01 +08:00
Louis Lam
794f1810bf Minor 2023-10-09 20:09:29 +08:00
Louis Lam
6b3d69e1d3 Ignore /extra/healthcheck-armv7 2023-09-18 03:59:56 +08:00
Louis Lam
59119b9e71 Merge branch '1.23.X'
# Conflicts:
#	package-lock.json
2023-09-18 03:26:59 +08:00
Louis Lam
f98a1ce077 Ignore some build files 2023-09-17 20:32:49 +08:00
Louis Lam
3e0f5f4231 Merge branch 'master' into 2.0.X
# Conflicts:
#	package-lock.json
#	server/database.js
#	server/util-server.js
2023-08-09 20:09:56 +08:00
Louis Lam
e9585ccbf4 Add .devcontainer to .dockerignore 2023-08-08 03:54:21 +08:00
Louis Lam
16a1a66e09 Merge remote-tracking branch 'origin/master' into 2.0.X
# Conflicts:
#	docker/alpine-base.dockerfile
#	docker/debian-base.dockerfile
#	docker/dockerfile
#	package.json
#	server/database.js
#	server/jobs/util-worker.js
#	server/model/maintenance.js
#	server/model/monitor.js
#	server/routers/api-router.js
#	server/server.js
#	server/uptime-kuma-server.js
2023-06-30 13:38:56 +08:00
Louis Lam
6a98ffe2f6 Merge remote-tracking branch 'origin/master' into exe
# Conflicts:
#	.dockerignore
#	.gitignore
2023-02-20 18:28:35 +08:00
Louis Lam
e4183ee2b7
Database Setup Page (#2738)
* WIP

* WIP: Database setup process

* Add database setup page
2023-02-11 14:41:02 +08:00
Louis Lam
3040bd41d9 Speed up armv7 build time of healthcheck by using go compiler cross-build feature in the host 2022-12-12 15:42:00 +08:00
Louis Lam
4a7e96f9ea Init C# Project for building exe 2022-10-06 12:08:10 +08:00
Louis Lam
7f9e291206 Ignore /cypress in .dockerignore 2022-09-09 16:36:32 +08:00
Louis Lam
d8b32d652f Update .dockerignore 2022-04-05 16:44:55 +08:00
Louis Lam
586c748d44 vite build on host machine, since it is very slow on armv7/arm64 build 2021-10-31 13:07:10 +08:00
Louis
d9eab90a69 Merge branch 'no-need-build'
# Conflicts:
#	.dockerignore
#	.gitignore
2021-10-10 16:34:13 +08:00
LouisLam
18e4702375 ignore .env 2021-10-07 14:34:30 +08:00
LouisLam
2625cbe0d2 add script for downloading the dist files from github 2021-10-02 14:43:31 +08:00
LouisLam
7b4c70860c split the base images in order to prevent recompile the base part 2021-10-01 17:28:00 +08:00
LouisLam
6681f49a58 Merge branch 'master' into public-dashboard
# Conflicts:
#	.dockerignore
2021-09-19 15:16:13 +08:00
Juan Calderon-Perez
2b8c049e7b
Add missing entries to dockerignore 2021-09-18 13:53:24 -04:00
LouisLam
b2ff6b6098 update ignore files and delete demo db 2021-09-16 00:12:39 +08:00
LouisLam
70a6f0313c update .dockerignore 2021-09-09 11:41:43 +08:00
LouisLam
f2de6299f6 update .dockerignore 2021-08-03 20:42:32 +08:00
LouisLam
4b86c84c36 fix icon for "Resume" 2021-07-30 01:02:41 +08:00
Sam
14e1d1f105
add .vscode directory to dockerignore 2021-07-20 17:39:21 +02:00
Adam Stachowicz
9f9c42c30b Update .dockerignore 2021-07-17 23:31:44 +02:00
LouisLam
2b8e33caed dockerfile: change the base image to node:14-alpine3.12; add apprise cli, prepare for implementing notification 2021-07-15 00:36:44 +08:00
LouisLam
ae07cd9c35 prepare for docker 2021-07-11 14:20:31 +08:00