Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixing networkx install for analyst build #154

Merged
merged 4 commits into from
Feb 28, 2024
Merged

fixing networkx install for analyst build #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
489659d
fixing networkx install for analyst build
marinagmoreira Feb 28, 2024
f232c06
fix ident
marinagmoreira Feb 28, 2024
468d302
uncommenting forgotten section
marinagmoreira Feb 28, 2024
58d05cb
fixing syntax on push file
marinagmoreira Feb 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions .github/workflows/ci_pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,7 @@ jobs:
--build-arg REMOTE=ghcr.io/nasa
-t ghcr.io/${{ github.repository_owner }}/isaac:msgs-ubuntu20.04

# Temp disabling the analyst build because it has a new version conflict issue. Re-enable once
# #136 is fixed.
#- name: Build analyst image isaac/isaac:msgs-ubuntu20.04
# run: docker build isaac -f isaac/scripts/docker/analyst.Dockerfile
# --build-arg REMOTE=ghcr.io/nasa
# -t ghcr.io/${{ github.repository_owner }}/isaac_analyst_notebook:latest
- name: Build analyst image isaac/isaac:msgs-ubuntu20.04
run: docker build isaac -f isaac/scripts/docker/analyst.Dockerfile
--build-arg REMOTE=ghcr.io/nasa
-t ghcr.io/${{ github.repository_owner }}/isaac_analyst_notebook:latest
14 changes: 5 additions & 9 deletions .github/workflows/ci_push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,10 @@ jobs:
--build-arg REMOTE=ghcr.io/nasa
-t ghcr.io/${{ github.repository_owner }}/isaac:msgs-ubuntu20.04

# Temp disabling the analyst build because it has a version conflict issue. Re-enable once
# #136 is fixed.
# *** Remember to uncomment the push below, as well!
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missed this! Refers to:

isaac/.github/workflows/ci_push.yml

Line 75 in f232c06

# Re-enable once #136 is fixed.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

awesome, thank you!

#- name: Build analyst image isaac/isaac:msgs-ubuntu20.04
# run: docker build isaac -f isaac/scripts/docker/analyst.Dockerfile
# --build-arg REMOTE=ghcr.io/nasa
# -t ghcr.io/${{ github.repository_owner }}/isaac_analyst_notebook:latest
- name: Build analyst image isaac/isaac:msgs-ubuntu20.04
run: docker build isaac -f isaac/scripts/docker/analyst.Dockerfile
--build-arg REMOTE=ghcr.io/nasa
-t ghcr.io/${{ github.repository_owner }}/isaac_analyst_notebook:latest


- name: Log in to registry
Expand All @@ -75,5 +72,4 @@ jobs:
if [ "${{ github.repository_owner }}" = "nasa" ]; then docker push ghcr.io/${{ github.repository_owner }}/isaac:latest-ubuntu20.04; fi;
if [ "${{ github.repository_owner }}" = "nasa" ]; then docker push ghcr.io/${{ github.repository_owner }}/isaac:astrobee-msgs-ubuntu20.04; fi;
if [ "${{ github.repository_owner }}" = "nasa" ]; then docker push ghcr.io/${{ github.repository_owner }}/isaac:msgs-ubuntu20.04; fi;
# Re-enable once #136 is fixed.
# if [ "${{ github.repository_owner }}" = "nasa" ]; then docker push ghcr.io/${{ github.repository_owner }}/isaac_analyst_notebook:latest; fi;
if [ "${{ github.repository_owner }}" = "nasa" ]; then docker push ghcr.io/${{ github.repository_owner }}/isaac_analyst_notebook:latest; fi;
1 change: 1 addition & 0 deletions scripts/docker/analyst.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ RUN apt-get update \

RUN pip3 install pyArango \
&& pip3 install jupyterlab jupyterhub nbconvert Pygments==2.6.1 jupyros \
&& pip3 install networkx==3.1 \
&& pip3 install matplotlib opencv-python numpy-quaternion pandas \
&& pip3 install torch torchvision --extra-index-url https://download.pytorch.org/whl/cpu

Expand Down
Loading