Skip to content

Commit

Permalink
Dockefile: use base image 'ubuntu:jammy' instead of focal
Browse files Browse the repository at this point in the history
Default python version in focal is python3.8 which is breaking
integration CI builds on t-api PRs with:
`ERROR: Package 'teuthology-1.1.1.dev729-g861a8dcf' requires a different Python: 3.8.10 not in '>=3.10'`

Recently, we upgraded the minimum teuthology version to support
python3.10, which could be the reason of the above CI failures.

Signed-off-by: Vallari Agrawal <[email protected]>
  • Loading branch information
VallariAg committed Jun 12, 2024
1 parent f0a9d59 commit 51c49d2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
8 changes: 5 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
FROM ubuntu:focal
FROM ubuntu:jammy
ENV DEBIAN_FRONTEND=noninteractive
ENV VENV=${VENV:-"venv"}
RUN apt-get update && \
apt-get install -y \
git \
Expand All @@ -21,7 +22,8 @@ RUN apt-get update && \
COPY .teuthology.yaml /root
WORKDIR /teuthology_api
COPY . /teuthology_api/
RUN pip3 install -e .
RUN python3 -m venv ${VENV}
RUN /teuthology_api/${VENV}/bin/pip3 install -e .
RUN mkdir /archive_dir/

CMD sh /teuthology_api/start_container.sh
ENTRYPOINT /teuthology_api/start_container.sh
5 changes: 3 additions & 2 deletions start_container.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
#!/usr/bin/env sh
#!/usr/bin/bash
set -ex
trap exit TERM

HOST=${TEUTHOLOGY_API_SERVER_HOST:-"0.0.0.0"}
PORT=${TEUTHOLOGY_API_SERVER_PORT:-"8082"}
VENV=${VENV:-"venv"}


source ${VENV}/bin/activate
cd /teuthology_api/src/

if [ "$DEPLOYMENT" = "development" ]; then
Expand Down

0 comments on commit 51c49d2

Please sign in to comment.