From 0e2b7207f37b55918a719b509a7c81a2dae53d38 Mon Sep 17 00:00:00 2001
From: tb06904 <141412860+tb06904@users.noreply.github.com>
Date: Tue, 5 Nov 2024 09:05:53 +0000
Subject: [PATCH] Gh-379: Fix github artifact upload (#383)

* fix small typo

* turn off jhub image

* scipy image version

* modern install method for plotly
---
 .github/workflows/release.yaml            | 2 +-
 cd/build_images.sh                        | 9 +++++----
 cd/publish_images.sh                      | 3 ++-
 docker/gaffer-pyspark-notebook/Dockerfile | 8 +++-----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 9880cbb1..7a226bba 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -160,7 +160,7 @@ jobs:
     - name: Upload Asset
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: gh release upload ${{ needs.release-version.outputs.release_version }} ${{ env.ASSET_FILENAME }}
+      run: gh release upload ${{ needs.get-release-version.outputs.release_version }} ${{ env.ASSET_FILENAME }}
 
   update-helm-repo:
     runs-on: ubuntu-latest
diff --git a/cd/build_images.sh b/cd/build_images.sh
index 7a4ea054..b16d6aa6 100755
--- a/cd/build_images.sh
+++ b/cd/build_images.sh
@@ -42,9 +42,10 @@ docker compose --project-directory ./docker/gaffer-road-traffic-loader/ -f ./doc
 docker compose --project-directory ./docker/gaffer-pyspark-notebook/ -f ./docker/gaffer-pyspark-notebook/docker-compose.yaml build notebook
 docker compose --project-directory ./docker/spark-py/ -f ./docker/spark-py/docker-compose.yaml build
 
-# Set $JHUB_OPTIONS_SERVER_VERSION
-source ./docker/gaffer-jhub-options-server/get-version.sh
-# Builds the jhub options server:
-docker compose --project-directory ./docker/gaffer-jhub-options-server/ -f ./docker/gaffer-jhub-options-server/docker-compose.yaml build
+# Currently disabled due to npm depencency issue
+# # Set $JHUB_OPTIONS_SERVER_VERSION
+# source ./docker/gaffer-jhub-options-server/get-version.sh
+# # Builds the jhub options server:
+# docker compose --project-directory ./docker/gaffer-jhub-options-server/ -f ./docker/gaffer-jhub-options-server/docker-compose.yaml build
 
 popd || exit 1
diff --git a/cd/publish_images.sh b/cd/publish_images.sh
index 1f9a0d43..c703150b 100755
--- a/cd/publish_images.sh
+++ b/cd/publish_images.sh
@@ -103,7 +103,8 @@ pushContainer gchq/gaffer "${GAFFER_VERSION}-accumulo-${ACCUMULO_VERSION}"
 pushContainer gchq/gaffer-rest "${GAFFER_VERSION}-accumulo-${ACCUMULO_VERSION}"
 pushContainer gchq/gaffer-road-traffic-loader "${GAFFER_VERSION}"
 pushContainer gchq/gaffer-pyspark-notebook "${GAFFER_VERSION}"
-pushContainer gchq/gaffer-jhub-options-server "${JHUB_OPTIONS_SERVER_VERSION}"
+# Currently disabled due to npm depencency issue
+# pushContainer gchq/gaffer-jhub-options-server "${JHUB_OPTIONS_SERVER_VERSION}"
 pushContainer gchq/spark-py "${SPARK_VERSION}"
 
 # Push legacy versions to Container Repositories
diff --git a/docker/gaffer-pyspark-notebook/Dockerfile b/docker/gaffer-pyspark-notebook/Dockerfile
index 91665df5..80378e61 100644
--- a/docker/gaffer-pyspark-notebook/Dockerfile
+++ b/docker/gaffer-pyspark-notebook/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 ARG BASE_IMAGE_NAME=jupyter/scipy-notebook
-ARG BASE_IMAGE_TAG=c26bf69c148d
+ARG BASE_IMAGE_TAG=x86_64-2023-10-20
 
 FROM ${BASE_IMAGE_NAME}:${BASE_IMAGE_TAG}
 
@@ -54,7 +54,7 @@ RUN cd /opt && \
 
 ARG FINDSPARK_VERSION=2.0.0
 ARG KUBERNETES_PYTHON_VERSION=21.7.0
-RUN pip install findspark==${FINDSPARK_VERSION} kubernetes==${KUBERNETES_PYTHON_VERSION}
+RUN pip install findspark==${FINDSPARK_VERSION} kubernetes==${KUBERNETES_PYTHON_VERSION} plotly==5.24.1
 
 ARG KUBECTL_VERSION=1.23.0
 RUN curl -fLo /bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl && \
@@ -65,9 +65,7 @@ RUN git clone -b ${GAFFERPY_VERSION} --depth 1 https://github.com/gchq/gafferpy
 	pushd gafferpy && \
 	python setup.py install && \
 	popd && \
-	rm -rf gafferpy
-
-RUN jupyter labextension install jupyterlab-plotly@5.5.0 && \
+	rm -rf gafferpy && \
 	rm -rf "/home/${NB_USER}/.cache/yarn"
 
 COPY ./examples /examples