From 128e667c0f54e2f3ebc1f33d04641210e382b66e Mon Sep 17 00:00:00 2001 From: Beto Dealmeida Date: Tue, 24 Sep 2024 15:25:25 -0400 Subject: [PATCH] Remove entrypoint --- .github/workflows/python-integration.yml | 2 +- postgres/entrypoint.sh | 22 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100755 postgres/entrypoint.sh diff --git a/.github/workflows/python-integration.yml b/.github/workflows/python-integration.yml index ff95ddda..6eec21fa 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 }} 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