kopia lustrzana https://github.com/OpenDroneMap/WebODM
Change test for docker-container detection
rodzic
14fdbb6a23
commit
99eb274840
|
@ -11,8 +11,7 @@ jobs:
|
|||
name: Checkout
|
||||
|
||||
- name: Build and Test
|
||||
shell: 'script -q -e -c "bash {0}"'
|
||||
run: |
|
||||
docker-compose -f docker-compose.yml -f docker-compose.build.yml up --build -d
|
||||
./wait-for-it.sh localhost:8000 -t 60 -- echo "WebODM is up"
|
||||
docker-compose exec webapp /bin/bash -c "/webodm/webodm.sh test"
|
||||
docker-compose exec -T webapp /webodm/webodm.sh test
|
|
@ -287,8 +287,7 @@ rebuild(){
|
|||
run_tests(){
|
||||
# If in a container, we run the actual test commands
|
||||
# otherwise we launch this command from the container
|
||||
in_container=$(grep 'docker\|lxc' /proc/1/cgroup || true)
|
||||
if [[ "$in_container" != "" ]]; then
|
||||
if [[ -f /.dockerenv ]]; then
|
||||
echo -e "\033[1mRunning frontend tests\033[0m"
|
||||
run "npm run test"
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue