mirror of
https://github.com/maplibre/martin.git
synced 2024-12-24 07:22:52 +03:00
fix docker build issues
This commit is contained in:
parent
53ebe95f28
commit
0576ca9442
3
.github/workflows/docker.yml
vendored
3
.github/workflows/docker.yml
vendored
@ -62,9 +62,10 @@ jobs:
|
||||
|
||||
- name: Test Docker image
|
||||
run: |
|
||||
TAG=$(echo '${{ steps.docker_meta.outputs.tags }}' | cut -d' ' -f1)
|
||||
TAG=$(echo '${{ steps.docker_meta.outputs.json }}' | jq -r '.tags[0]')
|
||||
export MARTIN_BUILD=-
|
||||
export MARTIN_BIN="docker run --rm --net host -e DATABASE_URL -v $PWD/tests:/tests $TAG"
|
||||
echo "MARTIN_BIN=$MARTIN_BIN"
|
||||
tests/test.sh
|
||||
env:
|
||||
DATABASE_URL: ${{ steps.pg.outputs.connection-uri }}
|
||||
|
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -1047,7 +1047,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "martin"
|
||||
version = "0.6.0-rc.1"
|
||||
version = "0.6.0"
|
||||
dependencies = [
|
||||
"actix",
|
||||
"actix-cors",
|
||||
|
@ -25,8 +25,9 @@ pub type Connection<'a> = PooledConnection<'a, ConnectionManager>;
|
||||
const REQUIRED_POSTGIS_VERSION: &str = ">= 2.4.0";
|
||||
|
||||
pub async fn setup_connection_pool(config: &PgConfig) -> io::Result<Pool> {
|
||||
let cfg = pg::Config::from_str(config.connection_string.as_str())
|
||||
.map_err(|e| prettify_error!(e, "Can't parse connection string"))?;
|
||||
let conn_str = config.connection_string.as_str();
|
||||
let cfg = pg::Config::from_str(conn_str)
|
||||
.map_err(|e| prettify_error!(e, "Can't parse connection string {}", conn_str))?;
|
||||
|
||||
#[cfg(not(feature = "ssl"))]
|
||||
let mgr = ConnectionManager::new(cfg, postgres::NoTls);
|
||||
|
Loading…
Reference in New Issue
Block a user