Skip to content

Commit

Permalink
to fix warning and use jammy (#3679) (#3706)
Browse files Browse the repository at this point in the history
* use ubuntu:jammy instead of focal for docker file

Also switch to Python 3.10 to match the version of python in Jammy.

Signed-off-by: Chen Lihui <[email protected]>
(cherry picked from commit 86bc311)

Co-authored-by: Chen Lihui <[email protected]>
  • Loading branch information
mergify[bot] and Chen Lihui authored Jun 5, 2023
1 parent 18dad5c commit 6cb7487
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 8 deletions.
19 changes: 11 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,36 @@ on: [push, pull_request]

jobs:
test:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Setup Python
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: '3.10'

- name: Install dependencies with pip
run: pip install --no-warn-script-location --user --upgrade -r requirements.txt

- name: Test doc8
run: make test

build:
needs: test
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Setup Python
uses: actions/setup-python@v1
uses: actions/setup-python@v4
with:
python-version: 3.8
python-version: '3.10'

- name: Setup Graphviz
uses: ts-graphviz/setup-graphviz@v1

- name: Install dependencies with pip
run: pip install --no-warn-script-location --user --upgrade -r requirements.txt
Expand Down
28 changes: 28 additions & 0 deletions docker/image/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# This dockerfile is expecting to be run with the following build command
# (from the root of the git repository):
#
# docker build -f docker/image/Dockerfile .

FROM ubuntu:jammy

ARG user=rosindex
ARG uid=1000

ENV DEBIAN_FRONTEND noninteractive

RUN apt-get update && \
apt-get install --no-install-recommends -y \
git-all \
graphviz \
make \
python3-pip && \
rm -rf /var/lib/apt/lists/*

RUN useradd -u $uid -m $user
ENV HOME=/home/$user
ENV PATH=/home/$user/.local/bin:$PATH
WORKDIR /tmp/doc_repository

USER $user

CMD pip3 install --no-warn-script-location --user --upgrade -r requirements.txt && make multiversion

0 comments on commit 6cb7487

Please sign in to comment.