Skip to content

Commit

Permalink
renaming ndency list, fixing docker build #15605
Browse files Browse the repository at this point in the history
  • Loading branch information
behrisch committed Oct 17, 2024
1 parent 77b5c04 commit 725d5cb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ jobs:
- name: Building Examples and Tests
if: matrix.build_type == 'full' && (github.repository == 'DLR-TS/sumo' || matrix.compiler == 'gcc')
run: |
sudo apt-get install $(cat sumo/build_config/test_req_deb.txt)
sudo apt-get install $(cat sumo/build_config/tools_req_deb.txt)
python3 -m venv testenv --system-site-packages
source testenv/bin/activate
python3 -m pip install -r sumo/tools/req_ci.txt -r sumo/tools/requirements.txt
Expand Down
6 changes: 4 additions & 2 deletions build_config/docker/Dockerfile.ubuntu.git
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,17 @@ FROM ubuntu:jammy

ENV SUMO_HOME=/usr/share/sumo

RUN apt-get -y update
RUN apt-get -y install git

RUN cd /opt; git clone --shallow-submodules --single-branch --recursive https://github.com/eclipse-sumo/sumo

RUN apt-get -y update
# basic build dependencies
RUN apt-get -y install $(cat /opt/sumo/build_config/build_req_deb.txt)
# 3D GUI, video recording
RUN apt-get -y install libopenscenegraph-dev libavformat-dev libswscale-dev
# packages needed for the tools (some are also listed in tools/requirements.txt but we prefer the ubuntu packages)
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install $(cat /opt/sumo/build_config/test_req_deb.txt)
RUN DEBIAN_FRONTEND=noninteractive apt-get -y install $(cat /opt/sumo/build_config/tools_req_deb.txt)

# python packages needed for the tools (the ones where we do not have ubuntu packages)
RUN pip3 install -r /opt/sumo/tools/requirements.txt
Expand Down
File renamed without changes.

0 comments on commit 725d5cb

Please sign in to comment.