2d4d8e6646
* docker: upgrade ubuntu version Upgrade rhe ubuntu version used in the main Dockerfile to latest stable version `20.04` * Update Dockerfile amended ubuntu version 20 -> 22 but then the following error: ``` 0 added, 0 removed; done. Running hooks in /etc/ca-certificates/update.d... done. Processing triggers for dbus (1.12.20-2ubuntu4.1) ... gpg: error running '/usr/bin/gpg-agent': probably not installed gpg: failed to start agent '/usr/bin/gpg-agent': Configuration error gpg: can't connect to the agent: Configuration error Traceback (most recent call last): File "/usr/lib/python3/dist-packages/softwareproperties/shortcuthandler.py", line 423, in add_key PPA publishes dbgsym, you may need to include 'main/debug' component Repository: 'deb https://ppa.launchpadcontent.net/ubuntugis/ubuntugis-unstable/ubuntu/ jammy main' Description: Unstable releases of Ubuntu GIS packages. These releases are more bleeding edge and while generally they should work well, they dont receive the same amount of quality assurance as our stable releases do. More info: https://launchpad.net/~ubuntugis/+archive/ubuntu/ubuntugis-unstable Adding repository. Adding deb entry to /etc/apt/sources.list.d/ubuntugis-ubuntu-ubuntugis-unstable-jammy.list Adding disabled deb-src entry to /etc/apt/sources.list.d/ubuntugis-ubuntu-ubuntugis-unstable-jammy.list Adding key to /etc/apt/trusted.gpg.d/ubuntugis-ubuntu-ubuntugis-unstable.gpg with fingerprint 6B827C12C2D425E227EDCA75089EBE08314DF160 subprocess.run(cmd.split(), check=True, input=keys) File "/usr/lib/python3.10/subprocess.py", line 524, in run raise CalledProcessError(retcode, process.args, subprocess.CalledProcessError: Command '['gpg', '-q', '--no-options', '--no-default-keyring', '--batch', '--keyring', '/etc/apt/trusted.gpg.d/ubuntugis-ubuntu-ubuntugis-unstable.gpg', '--homedir', '/tmp/tmpjlr98185', '--import']' returned non-zero exit status 2. During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/usr/bin/add-apt-repository", line 364, in <module> sys.exit(0 if addaptrepo.main() else 1) File "/usr/bin/add-apt-repository", line 357, in main shortcut.add() File "/usr/lib/python3/dist-packages/softwareproperties/shortcuthandler.py", line 222, in add self.add_key() File "/usr/lib/python3/dist-packages/softwareproperties/shortcuthandler.py", line 425, in add_key raise ShortcutException(e) softwareproperties.shortcuthandler.ShortcutException: Command '['gpg', '-q', '--no-options', '--no-default-keyring', '--batch', '--keyring', '/etc/apt/trusted.gpg.d/ubuntugis-ubuntu-ubuntugis-unstable.gpg', '--homedir', '/tmp/tmpjlr98185', '--import']' returned non-zero exit status 2. ```` Removing the ubuntugis PPA build without error - is ubuntugis a requirements? probably Jammy has up-to-date packages for pygeoapi dependencies * Update Dockerfile removing ubuntugis PPA * Update Dockerfile adding `python3-pytest` and `python3-pyld` dependencies * Update Dockerfile * Update Dockerfile * fixing docker environment with suggested changes * replace ubuntu version with codename * Update .dockerignore * Update Dockerfile * Update Dockerfile * Update Dockerfile * Update entrypoint.sh skip the SensorThings and other tests that require a local server Co-authored-by: Just van den Broecke <just@justobjects.nl>
111 lines
3.3 KiB
Bash
Executable File
111 lines
3.3 KiB
Bash
Executable File
#!/bin/bash
|
|
# =================================================================
|
|
#
|
|
# Authors: Just van den Broecke <justb4@gmail.com>
|
|
#
|
|
# Copyright (c) 2019 Just van den Broecke
|
|
#
|
|
# Permission is hereby granted, free of charge, to any person
|
|
# obtaining a copy of this software and associated documentation
|
|
# files (the "Software"), to deal in the Software without
|
|
# restriction, including without limitation the rights to use,
|
|
# copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
# copies of the Software, and to permit persons to whom the
|
|
# Software is furnished to do so, subject to the following
|
|
# conditions:
|
|
#
|
|
# The above copyright notice and this permission notice shall be
|
|
# included in all copies or substantial portions of the Software.
|
|
#
|
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
|
# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
|
# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
|
# OTHER DEALINGS IN THE SOFTWARE.
|
|
#
|
|
# =================================================================
|
|
|
|
# pygeoapi entry script
|
|
|
|
echo "START /entrypoint.sh"
|
|
|
|
set +e
|
|
|
|
export PYGEOAPI_HOME=/pygeoapi
|
|
export PYGEOAPI_CONFIG="${PYGEOAPI_HOME}/local.config.yml"
|
|
export PYGEOAPI_OPENAPI="${PYGEOAPI_HOME}/local.openapi.yml"
|
|
|
|
# gunicorn env settings with defaults
|
|
SCRIPT_NAME=${SCRIPT_NAME:=/}
|
|
CONTAINER_NAME=${CONTAINER_NAME:=pygeoapi}
|
|
CONTAINER_HOST=${CONTAINER_HOST:=0.0.0.0}
|
|
CONTAINER_PORT=${CONTAINER_PORT:=80}
|
|
WSGI_WORKERS=${WSGI_WORKERS:=4}
|
|
WSGI_WORKER_TIMEOUT=${WSGI_WORKER_TIMEOUT:=6000}
|
|
WSGI_WORKER_CLASS=${WSGI_WORKER_CLASS:=gevent}
|
|
|
|
# What to invoke: default is to run gunicorn server
|
|
entry_cmd=${1:-run}
|
|
|
|
# Shorthand
|
|
function error() {
|
|
echo "ERROR: $@"
|
|
exit -1
|
|
}
|
|
|
|
# Workdir
|
|
cd ${PYGEOAPI_HOME}
|
|
|
|
echo "Trying to generate openapi.yml"
|
|
pygeoapi openapi generate ${PYGEOAPI_CONFIG} --output-file ${PYGEOAPI_OPENAPI}
|
|
|
|
[[ $? -ne 0 ]] && error "openapi.yml could not be generated ERROR"
|
|
|
|
echo "openapi.yml generated continue to pygeoapi"
|
|
|
|
case ${entry_cmd} in
|
|
# Run Unit tests
|
|
test)
|
|
for test_py in $(ls tests/test_*.py)
|
|
do
|
|
# Skip tests requireing backend server or libs installed
|
|
case ${test_py} in
|
|
tests/test_elasticsearch__provider.py)
|
|
;&
|
|
tests/test_sensorthings_provider.py)
|
|
;&
|
|
tests/test_postgresql_provider.py)
|
|
;&
|
|
tests/test_mongo_provider.py)
|
|
echo "Skipping: ${test_py}"
|
|
;;
|
|
*)
|
|
python3 -m pytest ${test_py}
|
|
;;
|
|
esac
|
|
done
|
|
;;
|
|
|
|
# Run pygeoapi server
|
|
run)
|
|
# SCRIPT_NAME should not have value '/'
|
|
[[ "${SCRIPT_NAME}" = '/' ]] && export SCRIPT_NAME="" && echo "make SCRIPT_NAME empty from /"
|
|
|
|
echo "Start gunicorn name=${CONTAINER_NAME} on ${CONTAINER_HOST}:${CONTAINER_PORT} with ${WSGI_WORKERS} workers and SCRIPT_NAME=${SCRIPT_NAME}"
|
|
exec gunicorn --workers ${WSGI_WORKERS} \
|
|
--worker-class=${WSGI_WORKER_CLASS} \
|
|
--timeout ${WSGI_WORKER_TIMEOUT} \
|
|
--name=${CONTAINER_NAME} \
|
|
--bind ${CONTAINER_HOST}:${CONTAINER_PORT} \
|
|
pygeoapi.flask_app:APP
|
|
;;
|
|
*)
|
|
error "unknown command arg: must be run (default) or test"
|
|
;;
|
|
esac
|
|
|
|
echo "END /entrypoint.sh"
|