8 Commits (3b7bbb6e516e08c99cc798e2e12850988a941c57)

Author	SHA1	Message	Date
Benjamin Bädorf	5f45ee07ab	Move development docker-compose file to the main directory (#8798) ... * Move development docker-compose file to the main directory This requires us to move some other files around, like the pullpreview and example docker-compose file for production setups. This commit also does some housekeeping, like removing some old files and deduping configuration. * Updated to selenium grid * Fix in-Docker Selenium tests The Selenium tests now run inside a Docker Chrome Container. Backwards compatability with non-docker setups is not guaranteed, though it should not be hard to implement with a couple of small fixes. * Updated docker development documentation * Improved test timings, changed the documentation * Updated docker testing again * Run npm in the frontend directory * Really run npm in the frontend directory * Also run npm in frontend when setting up travis cache * Change directory for one command only * Change default test driver name * CI test change fixes * Fixed syntax error * Added dev check * Trying to fix firefox resizing * Trying to get tests running * Stop resizing firefox * Fixed apple icon spec * fix host in url helpers for omniauth spec * Fix omniauth specs * Fix docs * Small fixes to docker tests * Added package.json back in * Change env variables Co-authored-by: Markus Kahl <machisuji@gmail.com>	4 years ago
Benjamin Bädorf	67074c8248	Update docker development documentation ... Updated the docker development documentation and changed the backend run-app command to use `-u puma` instead of `thin`.	4 years ago
Benjamin Bädorf	8e4c3e2f8c	Use volumes for the tmp directory ... In some cases, uploaded assets might end up in the tmp directory. For this reason, tmp might not be as temporary as originally thought, and we should make sure to keep its contents around just in case.	4 years ago
Benjamin Bädorf	686f12315e	Revert changes to setup_dev ... They were unnecessary, and were not backwards-compatible with non-docker development	4 years ago
Benjamin Bädorf	fbf375d480	Updated local development docker setup ... There are now separate containers for testing purposes, and the frontend container is a node-only image. Containers run with a user that has the current user id and gid, making sure that any files that are installed by bundler or npm are user-owned. Selenium tests can be ran, but not all of them work yet.	4 years ago
Benjamin Bädorf	8be32c015f	Update docker development documentation ... Updated the docker development documentation and changed the backend run-app command to use `-u puma` instead of `thin`.	4 years ago
Benjamin Bädorf	b4104192e1	Use volumes for the tmp directory ... In some cases, uploaded assets might end up in the tmp directory. For this reason, tmp might not be as temporary as originally thought, and we should make sure to keep its contents around just in case.	4 years ago
Benjamin Bädorf	8b74bffac7	Revert changes to setup_dev ... They were unnecessary, and were not backwards-compatible with non-docker development	4 years ago
Benjamin Bädorf	a8dfb55345	Updated local development docker setup ... There are now separate containers for testing purposes, and the frontend container is a node-only image. Containers run with a user that has the current user id and gid, making sure that any files that are installed by bundler or npm are user-owned. Selenium tests can be ran, but not all of them work yet.	4 years ago
Benjamin Bädorf	08fb523269	Added PROXY_HOSTNAME env variable for local docker development ... Before, the webpack dev proxy tried to proxy any requests to `localhost:3000`. However, since the backend and frontend containers are different hosts in the docker context, it was proxying to itself and failing. The proxy now takes this env variable which is set in the docker-compose file to `backend`, but defaults to localhost for backward compatability.	4 years ago
Markus Kahl	871b10ce7e	upgrade to ruby 2.7.1	5 years ago
Markus Kahl	31546d91cc	docker-based dev environment	5 years ago
Markus Kahl	5c07f7bd95	docker-based dev environment	5 years ago