diff --git a/Dockerfile b/Dockerfile index 46274345..d95c2387 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG AZLINUX_BASE_VERSION=master ## For local development # FROM quay.io/cdis/python-nginx-al2:feat_python-nginx AS base -FROM 707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/python-nginx-al2:feat_python-nginx as base +FROM 707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/python-nginx-al2:feat_python-nginx AS base ENV appname=indexd diff --git a/docker-compose.yaml b/docker-compose.yaml deleted file mode 100644 index c0157eef..00000000 --- a/docker-compose.yaml +++ /dev/null @@ -1,36 +0,0 @@ -version: '3.8' - -services: - postgres: - image: postgres:13 - environment: - POSTGRES_USER: postgres - POSTGRES_PASSWORD: postgres - POSTGRES_DB: postgres - POSTGRES_HOST_AUTH_METHOD: trust - ports: - - "5432:5432" - - python: - image: quay.io/cdis/indexd:feat_GPE-788 - platform: linux/amd64 - volumes: - - .:/app - working_dir: /app - depends_on: - - postgres - network_mode: "service:postgres" - environment: - POSTGRES_USER: postgres - POSTGRES_PASSWORD: postgres - POSTGRES_DB: postgres - POSTGRES_HOST: postgres - POSTGRES_PORT: 5432 - PGHOST: postgres - command: > - bash -c " - source /venv/bin/activate && - poetry install && - bash tests/ci_commands_script.sh - # poetry run pytest -vv --cov=indexd --cov=migrations/versions --cov-append --cov-report xml tests - " diff --git a/poetry.lock b/poetry.lock index c3a8347b..bca486ff 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.8.4 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.8.2 and should not be changed by hand. [[package]] name = "alembic" @@ -715,13 +715,13 @@ test = ["objgraph", "psutil"] [[package]] name = "gunicorn" -version = "22.0.0" +version = "23.0.0" description = "WSGI HTTP Server for UNIX" optional = false python-versions = ">=3.7" files = [ - {file = "gunicorn-22.0.0-py3-none-any.whl", hash = "sha256:350679f91b24062c86e386e198a15438d53a7a8207235a78ba1b53df4c4378d9"}, - {file = "gunicorn-22.0.0.tar.gz", hash = "sha256:4a0b436239ff76fb33f11c07a16482c521a7e09c1ce3cc293c2330afe01bec63"}, + {file = "gunicorn-23.0.0-py3-none-any.whl", hash = "sha256:ec400d38950de4dfd418cff8328b2c8faed0edb0d517d3394e457c317908ca4d"}, + {file = "gunicorn-23.0.0.tar.gz", hash = "sha256:f014447a0101dc57e294f6c18ca6b40227a4c90e9bdb586042628030cba004ec"}, ] [package.dependencies] @@ -1626,4 +1626,4 @@ type = ["pytest-mypy"] [metadata] lock-version = "2.0" python-versions = ">=3.9,<4.0" -content-hash = "8681bdae6413fe559de688ef3e29e669db286e5c882f2d4ee14f937ea2ef2675" +content-hash = "4b5a302fbaf7b402a29db5e2fe71958b13e3dc8e55f22c2cd3da10f1e4cb23c1" diff --git a/pyproject.toml b/pyproject.toml index b1355933..67da51f7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -21,8 +21,8 @@ gen3authz = "^1.0.4" hsclient = {git = "https://github.com/uc-cdis/hsclient", rev = "1.0.0"} indexclient = "^2.1.0" jsonschema = "^3.2" -psycopg2-binary = "^2.7" -gunicorn = "^22.0.0" +psycopg2-binary = ">=2.7" +gunicorn = ">=22.0.0" flask = "^2.3.3" sqlalchemy = "^1.4.0" sqlalchemy-utils = "^0.37.3"