Skip to content

Commit

Permalink
Update nwb explorer - port to new dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
filippomc committed Feb 5, 2024
1 parent fd0031a commit 88f727b
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 19 deletions.
3 changes: 2 additions & 1 deletion applications/nwb-explorer/.dockerignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/deploy
/deploy
.git
23 changes: 6 additions & 17 deletions applications/nwb-explorer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,23 +1,14 @@
FROM node:15 as clone
ENV BRANCH_TAG="develop"
ENV REPO=https://github.com/MetaCell/nwb-explorer.git
RUN echo "cache 2024-02-05"
RUN git clone $REPO -b $BRANCH_TAG
RUN rm -Rf .git

FROM node:20 as jsbuild


ENV FOLDER=nwb-explorer



WORKDIR $FOLDER/webapp

COPY --from=clone nwb-explorer/webapp/package.json .
COPY --from=clone nwb-explorer/webapp/yarn.lock .
COPY dependencies/nwb-explorer.git/webapp/package.json .
COPY dependencies/nwb-explorer.git/webapp/yarn.lock .
RUN yarn install --network-timeout 1000000000
COPY --from=clone nwb-explorer/webapp/ .
COPY dependencies/nwb-explorer.git/webapp/ .
COPY geppetto/GeppettoConfiguration.json GeppettoConfiguration.json
RUN yarn build

Expand All @@ -40,23 +31,21 @@ RUN apt-get update -qq &&\
RUN chown $NB_UID /opt
RUN chown $NB_UID .



USER $NB_UID

COPY --from=clone $FOLDER/requirements.txt requirements.txt
COPY dependencies/nwb-explorer.git/requirements.txt requirements.txt
RUN --mount=type=cache,target=/root/.cache python -m pip install --upgrade pip &&\
pip install -r requirements.txt
RUN --mount=type=cache,target=/root/.cache python -m pip install --upgrade pip &&\
pip install cython --no-cache-dir
COPY --from=clone $FOLDER .
COPY dependencies/nwb-explorer.git/ .


RUN mkdir -p /opt/workspace
RUN ln -s /opt/workspace workspace
RUN mkdir -p /opt/home
RUN python utilities/install.py --npm-skip --no-test
COPY --from=clone $FOLDER/utilities/custom.css /home/jovyan/.jupyter/custom/custom.css
COPY dependencies/nwb-explorer.git/utilities/custom.css /home/jovyan/.jupyter/custom/custom.css

# this removes the frame ancestor default cors settings
RUN rm -f ~/.jupyter/*.json
Expand Down
4 changes: 4 additions & 0 deletions applications/nwb-explorer/deploy/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ harness:
auto: false
port: 80
name: proxy-public
dependencies:
git:
- url: https://github.com/MetaCell/nwb-explorer.git
branch_tag: development
jupyterhub:
args: ["--debug", "--NotebookApp.default_url=/geppetto", "--library=nwb_explorer", "--NotebookApp.notebook_dir=/opt/workspace"]
applicationHook: "osb_jupyter.change_pod_manifest"
Expand Down
2 changes: 1 addition & 1 deletion applications/osb-portal/deploy/values-minimal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ harness:
- workspaces
- jupyterhub
- notifications
- jupyterlab-minimal
- nwb-explorer

16 changes: 16 additions & 0 deletions deployment/codefresh-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@ steps:
revision: '${{CLOUDHARNESS_BRANCH}}'
working_directory: .
git: github
- title: Cloning nwb-explorer.git repository...
type: git-clone
repo: https://github.com/MetaCell/nwb-explorer.git
revision: development
working_directory: /home/user/OSBv2/./applications/dependencies/nwb-explorer.git
git: github
prepare_deployment:
title: Prepare helm chart
image: python:3.9.10
Expand Down Expand Up @@ -702,6 +708,16 @@ steps:
commands:
- echo $APP_NAME
scale:
volumemanager_api_test:
title: volumemanager api test
volumes:
- '${{CF_REPO_NAME}}/cloud-harness/applications/volumemanager:/home/test'
- '${{CF_REPO_NAME}}/deployment/helm/values.yaml:/opt/cloudharness/resources/allvalues.yaml'
environment:
- APP_URL=https://volumemanager.${{DOMAIN}}/api
commands:
- st --pre-run cloudharness_test.apitest_init run api/openapi.yaml --base-url
https://volumemanager.${{DOMAIN}}/api -c all
common_api_test:
title: common api test
volumes:
Expand Down

0 comments on commit 88f727b

Please sign in to comment.