From 489659d0fe02d25074e9e9e1b85006ef4fd8db4c Mon Sep 17 00:00:00 2001 From: Marina Moreira Date: Tue, 27 Feb 2024 17:13:32 -0800 Subject: [PATCH 1/4] fixing networkx install for analyst build --- .github/workflows/ci_pr.yml | 10 ++++------ .github/workflows/ci_push.yml | 11 ++++------- scripts/docker/analyst.Dockerfile | 1 + 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci_pr.yml b/.github/workflows/ci_pr.yml index abe63bad..1c99ce80 100644 --- a/.github/workflows/ci_pr.yml +++ b/.github/workflows/ci_pr.yml @@ -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 diff --git a/.github/workflows/ci_push.yml b/.github/workflows/ci_push.yml index d4c652f5..1a60d40d 100644 --- a/.github/workflows/ci_push.yml +++ b/.github/workflows/ci_push.yml @@ -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! - #- 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 diff --git a/scripts/docker/analyst.Dockerfile b/scripts/docker/analyst.Dockerfile index 24451887..c0f69bed 100644 --- a/scripts/docker/analyst.Dockerfile +++ b/scripts/docker/analyst.Dockerfile @@ -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 From f232c0677bfe213c47b247542df544993d0823fc Mon Sep 17 00:00:00 2001 From: Marina Moreira Date: Tue, 27 Feb 2024 17:16:25 -0800 Subject: [PATCH 2/4] fix ident --- .github/workflows/ci_pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_pr.yml b/.github/workflows/ci_pr.yml index 1c99ce80..7cf85928 100644 --- a/.github/workflows/ci_pr.yml +++ b/.github/workflows/ci_pr.yml @@ -62,6 +62,6 @@ jobs: -t ghcr.io/${{ github.repository_owner }}/isaac:msgs-ubuntu20.04 - name: Build analyst image isaac/isaac:msgs-ubuntu20.04 - run: docker build isaac -f isaac/scripts/docker/analyst.Dockerfile + 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 From 468d30212bfdd09e3b91c382e8998d51253a5c06 Mon Sep 17 00:00:00 2001 From: Marina Moreira Date: Wed, 28 Feb 2024 12:10:45 -0800 Subject: [PATCH 3/4] uncommenting forgotten section --- .github/workflows/ci_push.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci_push.yml b/.github/workflows/ci_push.yml index 1a60d40d..ccf1fe10 100644 --- a/.github/workflows/ci_push.yml +++ b/.github/workflows/ci_push.yml @@ -72,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; From 58d05cbbea471a28b72ac4c13ec8716736d52e12 Mon Sep 17 00:00:00 2001 From: Marina Moreira Date: Wed, 28 Feb 2024 13:05:37 -0800 Subject: [PATCH 4/4] fixing syntax on push file --- .github/workflows/ci_push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_push.yml b/.github/workflows/ci_push.yml index ccf1fe10..23e0e5b7 100644 --- a/.github/workflows/ci_push.yml +++ b/.github/workflows/ci_push.yml @@ -58,7 +58,7 @@ jobs: -t ghcr.io/${{ github.repository_owner }}/isaac:msgs-ubuntu20.04 - name: Build analyst image isaac/isaac:msgs-ubuntu20.04 - run: docker build isaac -f isaac/scripts/docker/analyst.Dockerfile + 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