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

Gh-379: Fix github artifact upload #383

Merged
merged 4 commits into from
Nov 5, 2024
Merged

Gh-379: Fix github artifact upload #383

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
db0a22e
fix small typo
tb06904 Nov 4, 2024
d3c646e
turn off jhub image
tb06904 Nov 4, 2024
aeb25bd
scipy image version
tb06904 Nov 4, 2024
a2b5eac
modern install method for plotly
tb06904 Nov 4, 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
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions cd/build_images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 2 additions & 1 deletion cd/publish_images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions docker/gaffer-pyspark-notebook/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}

Expand Down Expand Up @@ -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 && \
Expand All @@ -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 [email protected] && \
rm -rf gafferpy && \
rm -rf "/home/${NB_USER}/.cache/yarn"

COPY ./examples /examples
Expand Down