Skip to content

Commit 6cb7487

Browse files
mergify[bot]Chen Lihui
andauthored
to fix warning and use jammy (#3679) (#3706)
* 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]>
1 parent 18dad5c commit 6cb7487

File tree

2 files changed

+39
-8
lines changed

2 files changed

+39
-8
lines changed

.github/workflows/test.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,36 @@ on: [push, pull_request]
44

55
jobs:
66
test:
7-
runs-on: ubuntu-20.04
7+
runs-on: ubuntu-22.04
88
steps:
99
- name: Checkout
1010
uses: actions/checkout@v3
1111

1212
- name: Setup Python
13-
uses: actions/setup-python@v1
13+
uses: actions/setup-python@v4
1414
with:
15-
python-version: 3.8
15+
python-version: '3.10'
1616

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

2020
- name: Test doc8
2121
run: make test
22-
22+
2323
build:
2424
needs: test
25-
runs-on: ubuntu-20.04
25+
runs-on: ubuntu-22.04
2626
steps:
2727
- name: Checkout
2828
uses: actions/checkout@v3
29-
29+
3030
- name: Setup Python
31-
uses: actions/setup-python@v1
31+
uses: actions/setup-python@v4
3232
with:
33-
python-version: 3.8
33+
python-version: '3.10'
34+
35+
- name: Setup Graphviz
36+
uses: ts-graphviz/setup-graphviz@v1
3437

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

docker/image/Dockerfile

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# This dockerfile is expecting to be run with the following build command
2+
# (from the root of the git repository):
3+
#
4+
# docker build -f docker/image/Dockerfile .
5+
6+
FROM ubuntu:jammy
7+
8+
ARG user=rosindex
9+
ARG uid=1000
10+
11+
ENV DEBIAN_FRONTEND noninteractive
12+
13+
RUN apt-get update && \
14+
apt-get install --no-install-recommends -y \
15+
git-all \
16+
graphviz \
17+
make \
18+
python3-pip && \
19+
rm -rf /var/lib/apt/lists/*
20+
21+
RUN useradd -u $uid -m $user
22+
ENV HOME=/home/$user
23+
ENV PATH=/home/$user/.local/bin:$PATH
24+
WORKDIR /tmp/doc_repository
25+
26+
USER $user
27+
28+
CMD pip3 install --no-warn-script-location --user --upgrade -r requirements.txt && make multiversion

0 commit comments

Comments
 (0)