diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index e864bc2..51adc5b 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -22,7 +22,7 @@ jobs: --health-retries 5 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Build image run: DOCKER_BUILDKIT=1 docker build --tag ubuntu-com-security-api . @@ -50,7 +50,7 @@ jobs: --health-retries 5 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install dotrun uses: canonical/install-dotrun@main @@ -66,7 +66,7 @@ jobs: lint-python: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Node dependencies run: yarn install @@ -97,7 +97,7 @@ jobs: --health-retries 5 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Install requirements run: | @@ -120,7 +120,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Check inclusive naming uses: canonical-web-and-design/inclusive-naming@main diff --git a/Dockerfile b/Dockerfile index 4eb268f..c035405 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # Build stage: Install python dependencies # === -FROM ubuntu:focal AS python-dependencies +FROM ubuntu:jammy AS python-dependencies RUN apt-get update && apt-get install --no-install-recommends --yes python3-pip python3-setuptools python3-wheel build-essential ADD requirements.txt /tmp/requirements.txt RUN pip3 config set global.disable-pip-version-check true @@ -11,7 +11,7 @@ RUN --mount=type=cache,target=/root/.cache/pip pip3 install --user --requirement # Build the production image # === -FROM ubuntu:focal +FROM ubuntu:jammy # Install python and import python dependencies RUN apt-get update && apt-get install --no-install-recommends --yes python3-setuptools python3-lib2to3 python3-pkg-resources ca-certificates libsodium-dev gpg diff --git a/requirements.txt b/requirements.txt index 2a2b48c..eeeec6f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ canonicalwebteam.flask-base==1.1.0 alchemy-mock==0.4.3 -apispec==4.7.1 +apispec==6.3.0 flask-apispec==0.11.4 launchpadlib==1.11.0 macaroonbakery==1.3.1 @@ -8,11 +8,11 @@ marshmallow==3.19.0 python-dateutil==2.8.2 psycogreen==1.0.2 psycopg2-binary==2.9.5 -SQLAlchemy==1.4.46 -webargs==6.1.1 +SQLAlchemy==2.0.7 +webargs==8.2.0 sortedcontainers==2.4.0 -Flask-SQLAlchemy==2.5.1 -Flask-Migrate==3.1.0 +Flask-SQLAlchemy==3.0.3 +Flask-Migrate==4.0.4 flask-alchemydumps==0.0.13 SQLAlchemy-Utils==0.39.0