Commit Graph

248 Commits

Author SHA1 Message Date
Rory Powell 3d8a8dbdd6 Merge branch 'develop' into labday/nginx-error-page 2022-04-25 16:30:24 +01:00
Andrew Kingston 250bdd2d87
Merge pull request #5208 from Budibase/portainer-template
Add portainer template
2022-04-05 14:19:47 +01:00
Michael Drury 959763d934
Merge pull request #5209 from Budibase/labday/single-docker
Single docker file lab-day
2022-04-05 12:16:09 +01:00
mike12345567 441e988ea8 Review comments. 2022-04-05 11:33:55 +01:00
mike12345567 5c3e3419b4 Merge branch 'develop' of github.com:Budibase/budibase into labday/single-docker 2022-04-05 11:31:02 +01:00
Martin McKeaveney 21a4d0b03c fix CSP variables 2022-04-04 15:22:31 +01:00
mike12345567 67beee7d93 Fixing test case. 2022-04-01 13:47:38 +01:00
Andrew Kingston 549eda4912 Add portainer template 2022-04-01 12:52:55 +01:00
mike12345567 12be8ed357 Adding volumes. 2022-04-01 12:50:26 +01:00
mike12345567 56147b1a6e Minor changes to get BB client and manifest included correctly. 2022-04-01 12:37:01 +01:00
mike12345567 40d38e6e3d Single docker container configuration. 2022-04-01 01:00:52 +01:00
Rory Powell af9a2cfd2f Add static html error page to nginx for 502, 503, 504 2022-03-31 15:58:45 +01:00
Martin McKeaveney 487e0c3d03 adding string interpolation syntax in NGINX 2022-03-31 12:13:42 +01:00
Martin McKeaveney cdd1409f19 adding intercom kit to CSP, and variables 2022-03-31 12:09:55 +01:00
Martin McKeaveney e263cc31bb merge with master 2022-03-30 15:44:22 +01:00
Andrew Kingston 334e41644e Allow data URI's for image sources and font sources 2022-03-28 16:08:25 +01:00
Rory Powell 0ee41ea10c Merge branch 'master' into merge-master 2022-03-25 13:10:37 +00:00
Andrew Kingston 78e78523e0 Merge branch 'develop' of github.com:Budibase/budibase into feature/map-actions 2022-03-25 12:00:17 +00:00
Rory Powell 838ed8a64b Merge branch 'master' into fix/cross-tenant-apps-with-session 2022-03-25 10:53:10 +00:00
Martin McKeaveney d93d4d08f2 update always to unless-stopped 2022-03-24 17:35:35 +00:00
Rory Powell 5392de54d5 Merge branch 'master' into fix/cross-tenant-apps-with-session 2022-03-23 16:45:36 +00:00
Rory Powell cb6103a321 Fix cross tenant apps with session 2022-03-23 16:45:06 +00:00
Rene Pot d9c6590482 fix broken docs links 2022-03-23 14:47:27 +01:00
Martin McKeaveney 0d667e7fca watchtower should restart if it crashes 2022-03-23 09:52:27 +00:00
Martin McKeaveney 11b3d52857 increasing client max body size for uploads 2022-03-21 15:24:39 +00:00
Andrew Kingston 95e6d4fb45 Change dev docker-compose restart policy to on-failure to stop running BB docker containers 247 2022-03-15 11:17:32 +00:00
Martin McKeaveney 3104a14012 merge 2022-03-08 12:40:41 +01:00
Martin McKeaveney 43348fd54f merge from master 2022-03-08 12:34:27 +01:00
mike12345567 5d7f4b6ab7 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-03-04 11:25:32 +00:00
Martin McKeaveney 28c788ec84
Merge pull request #4631 from Budibase/ci/deploy-proxy
removing need for handlebars in nginx script, automating proxy servic…
2022-03-03 09:06:49 +00:00
Martin McKeaveney 79dfe56d11 allowing iframes from HTTPS URLs 2022-03-02 22:43:41 +01:00
mike12345567 45cc611e1e Fixing an issue found with nginx + minio. 2022-02-25 15:54:39 +00:00
Martin McKeaveney 3e703a0b58 removing need for handlebars in nginx script, automating proxy service deployment 2022-02-22 13:24:21 +01:00
Rory Powell 3ee7997dae Replace location specific with global http host rule 2022-02-21 10:46:45 +00:00
Rory Powell 0bf65376c3 Forward Host header to worker and server through NGINX 2022-02-21 10:22:26 +00:00
Rory Powell 64966ae0c3
Merge pull request #4565 from Budibase/update-nginx-dev
Add 'location = /' -> 4001 to nginx dev conf
2022-02-18 17:39:02 +00:00
Martin McKeaveney 39aed46754 updating airgapped docker build script 2022-02-18 15:43:07 +01:00
Rory Powell a8a8e97840 Add 'location = /' -> 4001 to nginx dev conf 2022-02-18 11:18:59 +00:00
Martin McKeaveney ddf75aae04
Create hosting.properties 2022-02-17 00:30:28 +01:00
Martin McKeaveney 8c254095b1 updated CSP to allow font awesome 2022-02-16 16:54:15 +01:00
Martin McKeaveney cf87c26fa2 adding k8s resolver and updating watchtower variable 2022-02-16 15:33:57 +01:00
Martin McKeaveney 09eb276c73 relevant image name 2022-02-16 14:24:52 +01:00
Martin McKeaveney 387e5035d1 update gitignore 2022-02-16 14:16:06 +01:00
Martin McKeaveney a85f667dbe templatize nginx configuration into one prod configuration and add NPM scripts to manage 2022-02-16 14:12:53 +01:00
Martin McKeaveney dd6f77684c increasing burst limit on k8s 2022-02-16 12:24:43 +01:00
Martin McKeaveney 687ff5acd6 removing exposed ports from docker configuration 2022-02-15 10:49:41 +01:00
Martin McKeaveney e7233f9086 increase burst limit, remove log mounts 2022-02-14 17:39:10 +01:00
Martin McKeaveney 57e554a98b fixes for k8s 2022-02-11 19:04:27 +01:00
Martin McKeaveney 27c0eafaf9 CSP fixes 2022-02-11 16:05:35 +01:00
Martin McKeaveney e1f78a326b set correct port for worker 2022-02-11 15:39:18 +01:00