Commit Graph

519 Commits

Author SHA1 Message Date
mike12345567 984d949781 Updating single image build - the old method of installing Node 18 was deprecated, switching to the new mechanism. 2023-11-01 15:02:55 +00:00
Andrew Kingston c73117e336
Merge branch 'master' into new-branding 2023-10-31 13:56:44 +00:00
Andrew Kingston 3162d45c5e Update error page again 2023-10-31 09:48:19 +00:00
Adria Navarro 0dd655e75d Remove sh 2023-10-30 14:39:03 +01:00
Andrew Kingston e103e6b85b Use new branding in error fallback page 2023-10-30 10:52:21 +00:00
andz-bb 4bcc49b692 add cloudfront to script csp to fix cloud plugins 2023-10-26 07:33:53 +01:00
Adria Navarro e3b342da57 Fix after renames 2023-10-23 13:57:23 +02:00
Adria Navarro 3c16e82035 Comment docker 2023-10-23 13:55:23 +02:00
Adria Navarro 0cc7cc67a3 Renames 2023-10-23 13:53:18 +02:00
Adria Navarro 133e475257 Add version to single image 2023-10-20 17:20:14 +02:00
Adria Navarro 4c19ad1ca7 Add versions to server/worker docker v2 2023-10-20 17:19:35 +02:00
Adria Navarro e5aefa83ec Fix single image dockerfile 2023-10-20 15:13:29 +02:00
Michael Drury 86b9556b0e
Merge branch 'master' into fix/couchdb-image-build 2023-10-20 12:23:22 +01:00
Adria Navarro 6b68e52836 Use v2 dockerfiles 2023-10-20 10:02:18 +02:00
Adria Navarro e80a20d61f Use root as docker context for the app/worker images 2023-10-18 16:08:54 +02:00
Adria Navarro b171e8e00f Update the script to be sh and workspace agnostic 2023-10-18 16:08:54 +02:00
mike12345567 705c948de7 Removing a sudo that was causing the docker image build to fail with buildx - we don't need sudo commands as the Dockerfile is always running as the root. 2023-10-18 14:51:49 +01:00
mike12345567 7d51a3d385 Extending Fauxton timeout from 600s -> 7200s. Allow for 2 hours before logout occurs. 2023-10-18 12:39:10 +02:00
Adria Navarro 572cac2552 Remove SENTRY_DSN references 2023-10-18 10:51:09 +02:00
Adria Navarro 697e733f82 Fix timeout 2023-10-17 15:25:27 +02:00
Adria Navarro 50a1a28a32 Replace localhost for 127.0.0.1 2023-10-16 15:52:10 +02:00
Adria Navarro fb1db135cf Remove packageNames file usages 2023-10-13 13:59:42 +02:00
Adria Navarro 543ecb8d58 Add single vs dockerfile in order to allow testing it 2023-10-13 12:58:07 +02:00
Adria Navarro 8f8226a6f8 Remove unnecessary rm 2023-10-06 12:26:24 +02:00
Adria Navarro 42b6489905 Add builder and pm2 config 2023-10-04 23:50:22 +02:00
Adria Navarro 59e52884d1 Yarn cache 2023-10-04 00:11:24 +02:00
Adria Navarro 1d4bc49152 Don't clean cache on the multistage 2023-10-03 22:38:37 +02:00
Adria Navarro 164f46d0f6 Use local string-templates 2023-10-03 19:55:24 +02:00
Adria Navarro 3d697949f0 Use local string-templates 2023-10-03 19:55:24 +02:00
Adria Navarro cba7746b5d Fix installs 2023-10-03 19:55:24 +02:00
Adria Navarro eb84bbc472 Remove husky reference 2023-10-03 19:55:23 +02:00
Adria Navarro 4ddc4ed1da Install production 2023-10-03 19:55:23 +02:00
Adria Navarro 7b1a1c691e Fix image 2023-10-03 19:55:23 +02:00
Adria Navarro 5497c3835f Fix runner 2023-10-03 19:55:23 +02:00
Adria Navarro 6903149fc1 Update node to 18 2023-10-03 19:55:23 +02:00
Adria Navarro 3f5c142674 Build azure docker image 2023-10-03 19:55:23 +02:00
Adria Navarro 4df12eda10 Fix prescript 2023-10-03 19:55:23 +02:00
Adria Navarro f23e91c6ce Unify dependencies 2023-10-03 19:55:23 +02:00
Gerard Burns efb3e9d461 correct nginx cors changes 2023-09-21 09:07:50 +01:00
Gerard Burns 36f351e96d Nginx cors changes to allow communicating with account portal from bb front end (#11831) 2023-09-20 12:08:46 +01:00
Rory Powell 9ff9da0247 Remove remaining references to `yarn bootstrap` 2023-09-05 16:37:57 +01:00
mike12345567 cad787a909 Removing old docker-compose.test.yaml that was causing flakiness and getting worker using mock redis. 2023-08-23 15:07:12 +01:00
mike12345567 7110351bdc Revert "revert develop into master"
This reverts commit fd099658a0.
2023-08-18 14:33:21 +01:00
Martin McKeaveney f0ee662d32 adding offline mode to .env 2023-08-16 17:17:05 +01:00
Jonny McCullagh 5669e82277 adoptjdk repo has changed to adoptium (#11521) 2023-08-15 10:59:46 +01:00
Adria Navarro 8375ea4c5a Fix order 2023-07-11 10:44:10 +02:00
Andrew Kingston 891bcc118a Add embed config to single image nginx config 2023-07-10 09:17:37 +01:00
Dean b6caebe431 Merge remote-tracking branch 'origin/develop' into feature/app-settings-section 2023-06-26 15:51:31 +01:00
Adria Navarro ed888e7391 Clean 2023-06-22 12:25:27 +01:00
Adria Navarro 55e38725db Add pg_dump to single dockerfile 2023-06-22 11:29:32 +01:00
Adria Navarro 921c821d2f Install pg_dump on docker 2023-06-21 11:33:37 +01:00
Dean 2304032423 Added embed state, behaviours and event tracking to client app. UI/UX Refactoring 2023-06-16 12:30:08 +01:00
Martin McKeaveney dd8e54c5e1 update airgap script and enable support for offline mode 2023-06-15 15:20:14 +01:00
mike12345567 70e4795349 Fix top level path within the single image to make sure it can find builder assets correctly. 2023-06-07 16:35:36 +01:00
Adria Navarro 692bca9587 Revert single image back to node 14 2023-06-07 11:11:13 +01:00
Adria Navarro bfd7b2f668 Fix yarn usage 2023-06-07 09:15:11 +01:00
Adria Navarro d21274ef2b Remove frozen-lockfile from dockerfiles 2023-06-07 09:05:34 +01:00
Adria Navarro d1af3f930e Add yarn.lock in single image docker 2023-06-06 14:45:20 +01:00
mike12345567 733e724eb3 PR comments. 2023-05-24 16:38:24 +01:00
mike12345567 90ffa338c3 Fixes the single image build, as well as fixing the nodemon process for the server. 2023-05-24 16:23:34 +01:00
Adria Navarro 62bff4e12b Clean 2023-05-24 13:26:02 +02:00
Adria Navarro 163f7fff2a Fix proxy issues on dev/docker-dev 2023-05-24 13:25:41 +02:00
Adria Navarro cc02632a28 Fix dev:docker 2023-05-24 12:51:26 +02:00
mike12345567 5039e63bfb PR comments. 2023-05-23 16:07:45 +01:00
Adria Navarro f27c4ae55a Use nx/esbuild for worker docker & dev 2023-05-19 14:45:05 +02:00
mike12345567 f3785892a9 Merge branch 'develop' of github.com:Budibase/budibase into chore/esbuild 2023-05-17 12:45:28 +01:00
Martin McKeaveney 927396d580 Update nginx.prod.conf 2023-05-16 11:42:47 +01:00
Martin McKeaveney bbf271961f adding healthcheck to proxy service 2023-05-09 11:48:49 +01:00
mike12345567 b2973a51b1 Updating Dockerfiles as per #10472 for master. 2023-05-03 18:22:19 +01:00
Adria Navarro a7f69231d9 Merge branch 'chore/npmless-builds' into chore/esbuild 2023-05-03 18:01:04 +01:00
Martin McKeaveney a2737346f1 Update Dockerfile 2023-05-03 16:49:12 +01:00
Martin McKeaveney 46acac0e5f Update Dockerfile 2023-05-03 16:48:53 +01:00
Martin McKeaveney b570efc2c6 Update Dockerfile 2023-05-03 16:42:26 +01:00
Martin McKeaveney 6df5e6f6d8 Update Dockerfile 2023-05-03 16:40:58 +01:00
mike12345567 de51364303 Some updates to Dockerfiles. 2023-04-27 17:00:15 +01:00
Martin McKeaveney b75caa03a6 updating production timeouts 2023-04-21 17:25:55 +01:00
Rory Powell e116941750 Rotatable secrets (#9982)
* Rotatable secrets

* Set new api encryption key var

* Lint

* Use fallback keys instead of array

* Point api encryption key to dedicated value

* Add API_ENCRYPTION_KEY to cli

* Lint + add api encryption key to env files
2023-03-13 15:02:59 +00:00
mike12345567 ac4478d969 Removing old version of minio from dev docker-compose file. 2023-03-08 13:40:06 +00:00
Michael Drury 03ff4daca3 Revert "pinning MinIO versions" 2023-03-08 13:35:26 +00:00
Martin McKeaveney d72114eba3 pinning MinIO versions 2023-03-08 12:17:15 +00:00
Martin McKeaveney 065c466eeb Merge pull request #9897 from Budibase/fix/csp-media-src
Add budi cdn to CSP media-src directive
2023-03-07 15:42:53 +00:00
Peter Clement f3b7445dcb fix formatting 2023-03-07 14:45:11 +00:00
Peter Clement 9f3f4d37bc Fix s3 csp 2023-03-07 14:37:35 +00:00
andz-bb bf903dc956 update csp media-src to allow media from budi cdn 2023-03-06 17:33:56 +00:00
mike12345567 6fac00b3de Attempting to fix issues where wrong port is picked for test containers, occurred a lot locally. 2023-02-27 21:19:07 +00:00
Peter Clement 2895c81a14 Merge pull request #8158 from Budibase/fix/update-csp-s3
Update CSP for S3
2023-02-16 15:42:24 +00:00
Peter Clement 55bff3de29 no wildcard at start of s3 csp 2023-02-16 10:18:48 +00:00
Peter Clement e7999504c8 wildcard all amazonaws addresses 2023-02-16 10:13:25 +00:00
mike12345567 3f7f66257d Merge branch 'master' of github.com:Budibase/budibase into develop 2023-02-14 17:57:23 +00:00
mike12345567 488b542ac1 Fix for #9654 - the error checking was looking at the through fields flipped, which caused many to many relationships to throw an error. Also I've updated the dev compose file on master so that switching between develop and master is smoother. 2023-02-14 14:38:55 +00:00
mike12345567 0c80ea2083 Merge branch 'master' of github.com:Budibase/budibase into develop 2023-02-10 17:42:56 +00:00
Martin McKeaveney 238854aa0e updating onboarding tour and fixing github CSP 2023-02-07 14:49:45 +00:00
melohagan 1fd0863468 Update .env
SQL_MAX_ROWS
2023-02-06 12:06:45 +00:00
adrinr 9936d03e27 Merge branch 'develop' into feature/dependencies-image 2023-02-03 10:44:40 +00:00
adrinr 79521dadc4 Remove unnecessary couch-init 2023-02-03 09:37:53 +00:00
Dean 0eed617866 Updated default feature flags to include onboarding by default. Added tenant overrides to allow exclusion from global features 2023-02-01 14:12:43 +00:00
adrinr b2813db5db Handle db creation race conditions 2023-01-31 16:15:11 +00:00
adrinr 8eb6ef4d76 Init couch db 2023-01-31 12:16:23 +00:00
adrinr ab7a83c9ec Remove unused container 2023-01-31 09:57:34 +00:00
adrinr b2db582f02 Use docker compose for test-containers 2023-01-30 18:15:29 +00:00