Commit Graph

442 Commits

Author SHA1 Message Date
mike12345567 5f1019d9fd Creating pure BB-CouchDB image. 2022-12-01 13:42:56 +00:00
mike12345567 cfbed0b236 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-11-21 15:05:48 +00:00
mike12345567 d2f8a59b65 Updating proxy configuration for docker-compose, k8s and single image to allow longer timeout for app export requests. Also fixing an issue that blocked requests from getting to app-service. 2022-11-15 10:49:17 +00:00
Jonny McCullagh c71f9ccecf single image NFS & more logging 2022-11-13 17:53:32 +00:00
Rory Powell 6783fd713e Update tenancy detection to honour any subdomain pattern according to platform url 2022-11-09 16:35:16 +00:00
mike12345567 ecb398bf98 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-11-09 13:41:51 +00:00
mike12345567 62f65d3c16 Updating nginx conf to allow export a lot longer period before timeout. 2022-11-09 11:33:57 +00:00
Rory Powell a6157e2c45 Add budibase.net to CSP 2022-11-08 10:26:28 +00:00
mike12345567 6d72e51d16 Some fixes for CLI to get exporting/importing with different ports working, as well as a fix for access to minio through proxy. 2022-10-26 18:51:58 +01:00
Andrew Kingston 603c8744a5 Merge branch 'master' into master-develop 2022-10-25 12:03:33 +01:00
Jonny McCullagh d1e729ec55 proxy IPv6 removal needs to happen after envsubst 2022-10-18 09:33:04 +01:00
Jonny McCullagh ecb47851d6 make proxy ipv6 customise script executable 2022-10-17 10:20:09 +01:00
Martin McKeaveney 6ff52c64a3 ipv6 change for master 2022-10-13 18:07:55 +01:00
Jonny McCullagh 5d0dd41de3 single image mount nfs share if vars defined 2022-10-13 11:57:00 +01:00
Rory Powell 36f122a0af Add additional timeout configuration to nginx.dev.conf.hbs 2022-10-13 11:26:25 +01:00
Jonny McCullagh eecaa61555 remove ipv6 conf from nginx proxy if ipv6 not enabled 2022-10-12 15:02:05 +01:00
Jonny McCullagh af2203fac8 remove ipv6 conf from nginx proxy if ipv6 not enabled 2022-10-12 14:54:25 +01:00
Jonny McCullagh 67301cfb58 remove ipv6 conf from nginx proxy if ipv6 not enabled 2022-10-12 14:53:06 +01:00
mike12345567 2421f16a8c Merge branch 'develop' of github.com:Budibase/budibase into develop 2022-10-06 16:58:33 +01:00
mike12345567 a86cdb3291 Fixing issue #8079 - making sure TARGETARCH gets correctly exported to environment to pick correct minio bundle. 2022-10-06 14:05:01 +01:00
Jonny McCullagh c456e2ad3d Merge pull request #8059 from Budibase/jonny/aas-storage
AAS enable app service storage
2022-10-03 14:32:16 +01:00
Jonny McCullagh ad70bd5a0b AAS enable app service storage 2022-09-30 11:47:01 +01:00
Jonny McCullagh 8fa5893b49 AAS enable app service storage 2022-09-30 11:43:42 +01:00
Rory Powell 143cf2ff35 Add ACCOUNT_PORTAL_URL to images default environment 2022-09-23 13:40:00 +01:00
Rory Powell aebc51299e Enable feature flags selfhost 2022-09-22 14:41:41 +01:00
Rory Powell 0f98f2fcaa Merge branch 'master' into develop 2022-09-15 10:19:56 +01:00
Jonny McCullagh b055a0e383 move env vars to runner.sh 2022-09-14 13:24:11 +01:00
Jonny McCullagh 6ab6ea62ac Azure App Service customisations 2022-09-13 16:08:54 +01:00
Andrew Kingston be15aff40f Merge branch 'develop' of github.com:Budibase/budibase into plugins-dev-experience-websocket 2022-09-12 20:00:32 +01:00
Rory Powell 45a43baee2 Merge branch 'master' into develop 2022-09-12 14:05:36 +01:00
Andrew Kingston 925477e156 Merge pull request #7670 from Budibase/update-preview-endpoint
Update preview endpoint
2022-09-07 12:21:48 +01:00
Andrew Kingston 2e72eb4f2e Merge branch 'plugins-dev-experience' of github.com:Budibase/budibase into plugins-dev-experience-websocket 2022-09-07 12:07:25 +01:00
Jonny McCullagh b3ad464cd9 single image data path 2022-09-07 10:51:53 +01:00
Andrew Kingston 0bc7ffe0a1 Update preview endpoint to be prefixed with /app to not require an updated proxy config 2022-09-07 10:40:00 +01:00
mike12345567 5c62bdac2e Merge branch 'develop' of github.com:Budibase/budibase into plugins-dev-experience 2022-09-05 14:14:47 +01:00
Rory Powell 5a34bda3e2 Configurable api rate limit through nginx 2022-09-05 09:54:07 +01:00
Rory Powell 6cee01ed74 Merge pull request #7622 from Budibase/configurable-api-rate-limit
Configurable api rate limit through nginx
2022-09-05 09:51:09 +01:00
Rory Powell dc35b0da78 Configurable api rate limit through nginx 2022-09-05 09:09:43 +01:00
Andrew Kingston a794e19dfc Update nginx confs and add to single image 2022-09-02 12:26:30 +01:00
Andrew Kingston 28aaaf9661 Update vite path for proxying websocket to be /vite 2022-09-02 11:48:45 +01:00
Andrew Kingston d989e346ca Merge branch 'plugins-dev-experience' of github.com:Budibase/budibase into plugins-dev-experience-websocket 2022-09-01 14:39:30 +01:00
mike12345567 320cbfada3 Merge branch 'develop' of github.com:Budibase/budibase into plugins-dev-experience 2022-08-31 15:53:32 +01:00
Martin McKeaveney 02c93071ee merge 2022-08-30 10:33:37 +01:00
Rory Powell 50ae706953 Update NGINX access log to show upstream_response_time, proxy_host and upstream_addr 2022-08-26 13:18:38 +01:00
Andrew Kingston a4684b8ac4 Add preview endpoint to prod nginx conf 2022-08-23 08:50:36 +01:00
Andrew Kingston 36b067a600 Merge branch 'plugins-dev-experience' of github.com:Budibase/budibase into plugins-dev-experience-websocket 2022-08-22 17:54:14 +01:00
Andrew Kingston 23a91b89a7 Merge branch 'develop' of github.com:Budibase/budibase into plugins-dev-experience 2022-08-22 11:27:04 +01:00
Andrew Kingston d19a0f171e Serve builder preview via server to fix dependency on third party cookies 2022-08-20 13:47:57 +01:00
Andrew Kingston 2c87d6e340 Initial work on websockets 2022-08-19 11:09:20 +01:00
Andrew Kingston 32025ef76d Merge branch 'develop' of github.com:Budibase/budibase into plugins-dev-experience 2022-08-17 16:13:27 +01:00
Andrew Kingston 5807488f19 Add PLUGINS_DIR env var and show example mount for HMR of plugins 2022-08-16 15:14:47 +00:00
Jonny McCullagh dfb368d3f3 fix sed apostrophe error and couchdb path 2022-08-16 15:08:00 +01:00
Andrew Kingston 16568f42ff Merge branch 'plugins-dev-experience' of github.com:Budibase/budibase into plugins-dev-experience 2022-08-16 09:33:17 +00:00
Andrew Kingston 1ef1cc84ad Proxy vite HMR websocket in dev 2022-08-16 09:25:16 +00:00
Andrew Kingston 6093da79d6 Add hot reloading for component plugins via watched plugin directory 2022-08-15 22:23:45 +01:00
Jonny McCullagh 625f36db7c Merge pull request #7226 from Budibase/azureappservice
single image build data path for azure
2022-08-11 15:18:24 +01:00
Jonny McCullagh 4c837f8e86 single image build data path for azure 2022-08-11 12:08:56 +01:00
Rory Powell 21f1970bf3 Revert proxy image change 2022-08-10 14:32:07 +01:00
Rory Powell ae5f0464b5 Merge pull request #7121 from Budibase/proxy-env-support-and-webhook-limiting
Add separate rate limiting config for webhooks + environment variable support
2022-08-10 09:00:20 +01:00
Rory Powell d36ff097ee Update posthog token 2022-08-08 14:03:04 +01:00
Rory Powell c94d916050 Add seperate rate limiting config for webhooks + environment variable support 2022-08-05 17:41:55 +01:00
mike12345567 bd7ace561a Merge branch 'master' of github.com:Budibase/budibase into develop 2022-07-22 19:14:35 +01:00
mike12345567 ccdf3cf901 Moving the single image healthcheck script to be within the single image directory and updating it to look for the environment variable file. 2022-07-19 14:39:52 +01:00
mike12345567 6f78b5eea8 Merge branch 'develop' of github.com:Budibase/budibase into labday/backups 2022-07-18 14:16:39 +01:00
mike12345567 a8a7bea658 Merge branch 'develop' of github.com:Budibase/budibase into labday/backups 2022-07-18 13:59:46 +01:00
Jonny McCullagh 4605308e22 WAzure App Service image to docker registry 2022-07-18 12:21:25 +01:00
mike12345567 f9547ba3ef Removing the volume tags from the old directories, instead focusing on the single data directory that is now used - #6715. 2022-07-15 11:08:03 +01:00
Michael Drury 9924c33f9b Merge pull request #6636 from Budibase/omnibus-action
Single image pipeline
2022-07-11 11:12:09 +01:00
mike12345567 e3e2892300 Updating dockerfile to be friendly to volume usage, as well as pre-filling with uuids rather than static secrets. 2022-07-08 18:33:07 +01:00
mike12345567 6a1c5b235d Moving files around to make single image build easier to follow, getting all data directories into one place for easy volume management. 2022-07-08 14:28:09 +01:00
mike12345567 f0d324c675 Adding missing environment variable. 2022-07-06 16:33:40 +01:00
mike12345567 e5ddcd9f86 Adding MinIO handling, backing up to disk by bucket name. 2022-06-30 20:26:49 +01:00
Andrew Kingston f49e2886ca Add env vars to hosting.properties and helm chart 2022-06-30 11:34:41 +01:00
Andrew Kingston 467cc27f47 Add env vars to automatically create initial admin user on first run 2022-06-30 11:28:52 +01:00
Jonny McCullagh 77725c1a74 update the readme 2022-06-24 18:59:32 +01:00
Jonny McCullagh 042eec5841 rename default nginx site config 2022-06-24 18:35:18 +01:00
Jonny McCullagh f00c8cc69f add support for Azure App Service 2022-06-24 17:48:34 +01:00
Jonny McCullagh af5d1c9647 restart nginx 2022-06-23 15:08:56 +01:00
Jonny McCullagh d7c11cfc46 fixes for single image build 2022-06-23 15:03:09 +01:00
Jonny McCullagh ecbc561a06 new lines at end of files 2022-06-22 14:38:45 +01:00
Jonny McCullagh a2f5d8212b add cron to renew cert 2022-06-22 13:57:46 +01:00
Jonny McCullagh b0bf8a2d11 add letsencrypt to single docker image 2022-06-22 13:38:33 +01:00
mike12345567 2a17e9f732 Review comments. 2022-06-22 12:40:33 +01:00
mike12345567 b42e0c1c5e Adding command for multiarch building with buildx, need to install qemu on Linux to make this work. 2022-06-21 19:52:44 +01:00
mike12345567 9ad9860a9c Fixing cleanup script, adding ARM support to dockerfile, as well as adding ARM client. 2022-06-21 17:56:55 +01:00
mike12345567 af60582dad Slimming build down from 4GB to 1.8GB for single image. 2022-06-16 20:38:24 +01:00
mike12345567 148c7010e8 Updating the single image docker build to pin versions before build to allow it to work with develop etc. Also optimising the image a bit so that it can be built significantly faster. 2022-06-16 19:30:34 +01:00
Rory Powell 396a07cac5 Merge branch 'release' into feature/event-backfill 2022-06-09 15:21:49 +01:00
Peter Clement 2b117a1a35 update csp to account for certain s3 addresses 2022-06-07 11:03:33 +01:00
Rory Powell f47cee2ab6 Update lockfiles 2022-06-06 16:33:10 +01:00
Rory Powell a4eef3daab Add awareness of deployment environment 2022-06-01 14:10:00 +01:00
Kacper eab84b4c63 Content Security Policy fix for S3 upload
CSP allows wildcard only at first element of FQDN, so policy `*.s3.*.amazonaws.com` is invalid cause it contains second wildcard in the middle of FQDN.

nginx.prod.conf.hbs is not parsed by real handlebarsJS but manual way with regex and replacements. It's impossible to use `{{#each}}` so I've hardcoded all regions available for S3 basing on documentation under: https://docs.aws.amazon.com/general/latest/gr/s3.html
2022-05-05 22:26:57 +02:00
Martin McKeaveney 70fce03c09 updating helm chart for storage classes 2022-04-27 12:42:57 +01:00
Rory Powell be16540a8f Replace spectrum with custom CSS 2022-04-25 16:39:44 +01:00
Rory Powell 9e7cec7c01 Merge branch 'develop' into labday/nginx-error-page 2022-04-25 16:30:24 +01:00
Andrew Kingston 4897607860 Merge pull request #5208 from Budibase/portainer-template
Add portainer template
2022-04-05 14:19:47 +01:00
Michael Drury 130a02889a Merge pull request #5209 from Budibase/labday/single-docker
Single docker file lab-day
2022-04-05 12:16:09 +01:00
mike12345567 6dd50eb25a Review comments. 2022-04-05 11:33:55 +01:00
mike12345567 1f982428e2 Merge branch 'develop' of github.com:Budibase/budibase into labday/single-docker 2022-04-05 11:31:02 +01:00
Martin McKeaveney 2050645d80 fix CSP variables 2022-04-04 15:22:31 +01:00
mike12345567 05af8cafc2 Fixing test case. 2022-04-01 13:47:38 +01:00
Andrew Kingston 60cffc3eac Add portainer template 2022-04-01 12:52:55 +01:00
mike12345567 28e47a5fa8 Adding volumes. 2022-04-01 12:50:26 +01:00
mike12345567 a1f4a237f0 Minor changes to get BB client and manifest included correctly. 2022-04-01 12:37:01 +01:00
mike12345567 4b7ffbbce7 Single docker container configuration. 2022-04-01 01:00:52 +01:00
Rory Powell 5d2205a9bb Add static html error page to nginx for 502, 503, 504 2022-03-31 15:58:45 +01:00
Martin McKeaveney c86daa60c8 adding string interpolation syntax in NGINX 2022-03-31 12:13:42 +01:00
Martin McKeaveney f786701c7a adding intercom kit to CSP, and variables 2022-03-31 12:09:55 +01:00
Martin McKeaveney 034408b3c2 merge with master 2022-03-30 15:44:22 +01:00
Andrew Kingston cd84bd3f54 Allow data URI's for image sources and font sources 2022-03-28 16:08:25 +01:00
Rory Powell 69b2b38aea Merge branch 'master' into merge-master 2022-03-25 13:10:37 +00:00
Andrew Kingston bedbf4bcae Merge branch 'develop' of github.com:Budibase/budibase into feature/map-actions 2022-03-25 12:00:17 +00:00
Rory Powell 36a7323676 Merge branch 'master' into fix/cross-tenant-apps-with-session 2022-03-25 10:53:10 +00:00
Martin McKeaveney 14c75b2907 update always to unless-stopped 2022-03-24 17:35:35 +00:00
Rory Powell 5851525c88 Merge branch 'master' into fix/cross-tenant-apps-with-session 2022-03-23 16:45:36 +00:00
Rory Powell a68abf2730 Fix cross tenant apps with session 2022-03-23 16:45:06 +00:00
Rene Pot 6e0b29667d fix broken docs links 2022-03-23 14:47:27 +01:00
Martin McKeaveney 0bf5d3a8d4 watchtower should restart if it crashes 2022-03-23 09:52:27 +00:00
Martin McKeaveney e2d9811474 increasing client max body size for uploads 2022-03-21 15:24:39 +00:00
Andrew Kingston d89b12c57d 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 14cffcd6ff merge 2022-03-08 12:40:41 +01:00
Martin McKeaveney 975eb0b99e merge from master 2022-03-08 12:34:27 +01:00
mike12345567 63bb4f34c4 Merge branch 'master' of github.com:Budibase/budibase into develop 2022-03-04 11:25:32 +00:00
Martin McKeaveney b28bffbb15 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 81f34a50fa allowing iframes from HTTPS URLs 2022-03-02 22:43:41 +01:00
mike12345567 2c4b36e4f9 Fixing an issue found with nginx + minio. 2022-02-25 15:54:39 +00:00
Martin McKeaveney 1cbca0578a removing need for handlebars in nginx script, automating proxy service deployment 2022-02-22 13:24:21 +01:00
Rory Powell 0f3df713d0 Replace location specific with global http host rule 2022-02-21 10:46:45 +00:00
Rory Powell bd73f8fd25 Forward Host header to worker and server through NGINX 2022-02-21 10:22:26 +00:00
Rory Powell c326771cb0 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 a09fd51fbd updating airgapped docker build script 2022-02-18 15:43:07 +01:00
Rory Powell da9be1b20a Add 'location = /' -> 4001 to nginx dev conf 2022-02-18 11:18:59 +00:00
Martin McKeaveney bfaca430da Create hosting.properties 2022-02-17 00:30:28 +01:00
Martin McKeaveney b259bcc9b6 updated CSP to allow font awesome 2022-02-16 16:54:15 +01:00
Martin McKeaveney a7a82dc679 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
Martin McKeaveney b6320f14cc Merge branch 'fix/nginx' of github.com:Budibase/budibase into fix/nginx 2022-02-11 15:14:40 +01:00
Martin McKeaveney 082be8ef67 fix port redirection issue 2022-02-11 15:13:31 +01:00
mike12345567 a78dd38a58 Fixing img-src for self host. 2022-02-11 13:23:15 +00:00
Martin McKeaveney 8f668eac85 add csp update for nginx in self host 2022-02-11 13:23:53 +01:00
Martin McKeaveney b2c4b60aff fix for csp for images 2022-02-11 13:22:14 +01:00
Martin McKeaveney 1300216812 fix path in /app for k8s 2022-02-11 13:21:03 +01:00