Skip to content

Commit a6881ac

Browse files
committed
feat: drop old gcc-11 & python3.9
1 parent a4ebf84 commit a6881ac

File tree

2 files changed

+8
-19
lines changed

2 files changed

+8
-19
lines changed

.github/workflows/build-docker-tutorial.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ on:
77
- 'tutorial/Dockerfile'
88
- 'tutorial/root/**'
99
- '.github/workflows/build-docker-tutorial.yml'
10+
workflow_run:
11+
workflows:
12+
- Build code-server Docker Image
13+
types:
14+
- completed
1015

1116
jobs:
1217
build-and-push:

Dockerfile

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
# official codercom/code-server is based on debian:bookworm, but we prefer ubuntu
22
FROM lscr.io/linuxserver/code-server:4.103.2
33

4-
# we need python3.9 for GEM5, we can get it from deadsnakes/ppa
5-
RUN apt-get update && \
6-
apt-get install -y --no-install-recommends software-properties-common && \
7-
add-apt-repository ppa:deadsnakes/ppa
8-
94
# install dependencies for XiangShan
105
RUN apt-get update && \
116
apt-get install -y --no-install-recommends \
@@ -31,10 +26,9 @@ RUN apt-get update && \
3126
pkg-config \
3227
python3-pip \
3328
device-tree-compiler \
34-
# install gcc 11 to sync with our server environment
35-
gcc-11 \
36-
g++-11 \
37-
gcc-11-riscv64-linux-gnu \
29+
gcc \
30+
g++ \
31+
gcc-riscv64-linux-gnu \
3832
# runtime
3933
openjdk-21-jre \
4034
# libraries
@@ -52,7 +46,6 @@ RUN apt-get update && \
5246
libprotoc-dev \
5347
libgoogle-perftools-dev \
5448
libboost-all-dev \
55-
python3.9-dev \
5649
&& \
5750
apt-get clean
5851

@@ -70,15 +63,6 @@ RUN python3 -m pip install --break-system-packages \
7063
pandas \
7164
scipy
7265

73-
# use gcc-11 to sync with our server environment
74-
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 100 && \
75-
update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-11 100 && \
76-
update-alternatives --install /usr/bin/riscv64-linux-gnu-gcc riscv64-linux-gnu-gcc /usr/bin/riscv64-linux-gnu-gcc-11 100
77-
78-
# also use python3.9-config as default python3-config for GEM5 scons script
79-
RUN rm /usr/bin/python3-config && \
80-
ln -s /usr/bin/python3.9-config /usr/bin/python3-config
81-
8266
# install extensions for code-server
8367
# RUN /app/code-server/bin/code-server --install-extension ms-toolsai.jupyter && \
8468
# /app/code-server/bin/code-server --install-extension ms-python.python && \

0 commit comments

Comments
 (0)