kopia lustrzana https://github.com/OpenDroneMap/WebODM
Fix GDAL detection, remove circleCI config
rodzic
0003416cc7
commit
19e89ce7bd
33
config.yml
33
config.yml
|
@ -1,33 +0,0 @@
|
|||
# CircleCI 2.0 configuration file
|
||||
#
|
||||
# Check https://circleci.com/docs/2.0/ for more details
|
||||
#
|
||||
version: 2
|
||||
jobs:
|
||||
build:
|
||||
working_directory: /app
|
||||
docker:
|
||||
- image: docker:stable-git
|
||||
steps:
|
||||
- checkout
|
||||
- setup_remote_docker
|
||||
- run:
|
||||
name: Install dependencies
|
||||
command: |
|
||||
apk add --no-cache \
|
||||
py-pip=9.0.0-r1
|
||||
pip install \
|
||||
docker-compose==1.25.0
|
||||
- run:
|
||||
name: Build application Docker image
|
||||
command: |
|
||||
docker-compose -f docker-compose.yml -f docker-compose.build.yml up --build -d
|
||||
- run:
|
||||
name: Wait for Docker Image
|
||||
command: |
|
||||
while sleep 5; do docker ps -a; if [[ -n "`docker ps | grep webapp | grep ' Up '`" ]]; then break; fi; done
|
||||
- run:
|
||||
name: Run tests
|
||||
command: |
|
||||
docker-compose exec webapp /bin/bash -c "/webodm/webodm.sh test"
|
||||
|
2
start.sh
2
start.sh
|
@ -28,7 +28,7 @@ if [ $? -ne 0 ]; then
|
|||
fi
|
||||
|
||||
# Check GDAL version
|
||||
python -c "import sys;import re;import subprocess;version = subprocess.Popen([\"gdalinfo\", \"--version\"], stdout=subprocess.PIPE).communicate()[0].decode().rstrip();ret = 0 if re.compile('^GDAL [2-9]\.[1-9]+').match(version) else 1; print('Checking GDAL version... ' + ('{}, excellent!'.format(version) if ret == 0 else version));sys.exit(ret);"
|
||||
python -c "import sys;import re;import subprocess;version = subprocess.Popen([\"gdalinfo\", \"--version\"], stdout=subprocess.PIPE).communicate()[0].decode().rstrip();ret = 0 if re.compile('^GDAL [2-9]\.[0-9]+').match(version) else 1; print('Checking GDAL version... ' + ('{}, excellent!'.format(version) if ret == 0 else version));sys.exit(ret);"
|
||||
if [ $? -ne 0 ]; then
|
||||
almost_there
|
||||
echo -e "\033[33mYour system is currently using a version of GDAL that is too old, or GDAL is not installed. You need to install or configure your system to use GDAL 2.1 or higher. If you have installed multiple versions of GDAL, make sure the newer one takes priority in your PATH environment variable.\033[39m"
|
||||
|
|
Ładowanie…
Reference in New Issue