Skip to content

Commit 6cf2853

Browse files
authored
Merge pull request #37 from Tigul/docker-fix
Fix docker file for Mulverse-parser
2 parents f9675a6 + cb90e14 commit 6cf2853

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ jobs:
3232
cd /opt/ros/overlay_ws/src/semantic_world
3333
source ../semantic_world-venv/bin/activate
3434
pip install -U pip && pip install -r requirements.txt && pip install . && pip install -r doc/requirements.txt
35+
echo "PATH=$PWD/ultiverse-Parser/ext/blender:$PWD/ultiverse-Parser/USD/linux/lib/python:$PWD/ultiverse-Parser/USD/linux/plugin/usd:$PATH" >> $GITHUB_ENV
36+
echo "PYTHONPATH=$PWD/ultiverse-Parser/USD/linux/lib/python:$PWD/src" >> $GITHUB_ENV
37+
3538
3639
- name: Run tests
3740
run: |

docker/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ RUN python3 -m venv semantic_world-venv --system-site-packages && source semant
1818

1919
# Install the Multiverse Parser
2020
RUN git clone https://github.com/Multiverse-Framework/Multiverse-Parser.git
21-
RUN source semantic_world-venv/bin/activate && pip install -r ../Multiverse-Parser/requirements.txt && pip install -e ../Multiverse-Parser
22-
RUN echo "PATH=$OVERLAY_WS/src/Multiverse-Parser/ext/blender:$OVERLAY_WS/src/Multiverse-Parser/USD/linux/lib/python:$OVERLAY_WS/src/Multiverse-Parser/USD/linux/plugin/usd:$PATH" >> $GITHUB_ENV
23-
RUN echo "PYTHONPATH=$OVERLAY_WS/src/Multiverse-Parser/USD/linux/lib/python:$OVERLAY_WS/src/src" >> $GITHUB_ENV
21+
RUN source semantic_world-venv/bin/activate && pip install -r Multiverse-Parser/requirements.txt && pip install -e Multiverse-Parser
22+
2423

2524
COPY entrypoint.sh /
2625
ENTRYPOINT ["bash", "/entrypoint.sh"]

0 commit comments

Comments
 (0)