diff --git a/.github/workflows/python-integration.yml b/.github/workflows/python-integration.yml index ff95ddda..37a68d8a 100644 --- a/.github/workflows/python-integration.yml +++ b/.github/workflows/python-integration.yml @@ -36,7 +36,7 @@ jobs: docker compose -f postgres/docker-compose.yml up --build -d - name: Wait for Postgres to become available run: | - until docker run --network container:postgres_postgres_1 postgres_postgres pg_isready -h postgres -p 5432 -U shillelagh --timeout=90; do sleep 10; done + until docker run --network container:postgres-postgres-1 postgres-postgres pg_isready -h postgres -p 5432 -U shillelagh --timeout=90; do sleep 10; done - name: Test with pytest env: SHILLELAGH_ADAPTER_KWARGS: ${{ secrets.SHILLELAGH_ADAPTER_KWARGS }} @@ -45,5 +45,5 @@ jobs: - name: Stop the Postgres service if: always() run: | - docker logs postgres_postgres_1 + docker logs postgres-postgres-1 docker compose -f postgres/docker-compose.yml down diff --git a/postgres/entrypoint.sh b/postgres/entrypoint.sh deleted file mode 100755 index 063b9f60..00000000 --- a/postgres/entrypoint.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -set -e # If any command fails, stop the script - -# create virtualenv -cd -python3 -m venv venv -source venv/bin/activate -pip3 install 'setuptools>=61' wheel - -# install shillelagh -cd /src -pip3 install -v -e '.[all]' - -# install multicorn2 -rm -rf multicorn2 -git clone https://github.com/pgsql-io/multicorn2.git -cd multicorn2 -git checkout v2.5 -pip3 install . - -# call the original entrypoint -exec docker-entrypoint.sh postgres