Skip to content
This repository has been archived by the owner on Jul 11, 2024. It is now read-only.

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Jan 16, 2024
2 parents 903d33a + 9764deb commit ab00687
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 24 deletions.
16 changes: 6 additions & 10 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -61,25 +61,21 @@ RUN curl -O https://downloads.rclone.org/rclone-current-linux-amd64.deb && \

ENV RCLONE_CONFIG=/srv/.rclone/rclone.conf

# Initialization scripts
# Install deep-start script
# * allows to run shorter command "deep-start"
# * allows to install jupyterlab or code-server (vscode),
# if requested during container creation
RUN git clone https://github.com/deephdc/deep-start /srv/.deep-start && \
ln -s /srv/.deep-start/deep-start.sh /usr/local/bin/deep-start && \
ln -s /srv/.deep-start/run_jupyter.sh /usr/local/bin/run_jupyter
ln -s /srv/.deep-start/deep-start.sh /usr/local/bin/deep-start

# Install JupyterLab
ENV JUPYTER_CONFIG_DIR /srv/.deep-start/
# Necessary for the Jupyter Lab terminal
ENV SHELL /bin/bash
RUN if [ "$jlab" = true ]; then \
# by default has to work (1.2.0 wrongly required nodejs and npm)
pip3 install --no-cache-dir jupyterlab ; \
else echo "[INFO] Skip JupyterLab installation!"; fi

# Install user app

RUN apt-get update && apt-get -y --no-install-recommends install libgl1 libglib2.0-0 libsm6 libxrender1 libxext6 unzip psmisc

RUN git clone -b $branch https://github.com/ai4eosc-psnc/integrated_plant_protection && \
RUN git clone -b $branch --depth 1 https://github.com/ai4eosc-psnc/integrated_plant_protection && \
cd integrated_plant_protection && \
pip3 install --no-cache-dir -e . && \
cd ..
Expand Down
14 changes: 0 additions & 14 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -108,19 +108,5 @@ pipeline {
}
}

stage("Render metadata on the marketplace") {
when {
allOf {
branch 'master'
changeset 'metadata.json'
}
}
steps {
script {
def job_result = JenkinsBuildJob("Pipeline-as-code/deephdc.github.io/pelican")
job_result_url = job_result.absoluteUrl
}
}
}
}
}

0 comments on commit ab00687

Please sign in to comment.