Skip to content

Commit

Permalink
Update dependencies for aiida-2.x (#277)
Browse files Browse the repository at this point in the history
* Update base aiida-core image to 2.0.3
* Update aiidalab to v22.08.0
* Update aiidalab-home to v22.08.0
* Remove reentry runs, as they are not needed for aiida-2.x
  • Loading branch information
yakutovicha authored Aug 19, 2022
1 parent b53bc67 commit 031c604
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
7 changes: 3 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM aiidateam/aiida-core:1.6.9
FROM aiidateam/aiida-core:2.0.3

LABEL maintainer="AiiDAlab Team <[email protected]>"

Expand Down Expand Up @@ -87,12 +87,11 @@ RUN conda install --yes -c conda-forge \
rdkit==2021.09.2 \
&& conda clean --all

# Install AiiDAlab Python packages into user conda environment and populate reentry cache.
# Install AiiDAlab Python packages into user conda environment.
COPY requirements.txt .
ARG extra_requirements
RUN pip install --upgrade pip
RUN pip install -r requirements.txt $extra_requirements
RUN reentry scan

# Configure pip to use requirements file as constraints file.
RUN conda env config vars set PIP_CONSTRAINT=/opt/requirements.txt
Expand All @@ -110,7 +109,7 @@ COPY opt/prepare-aiidalab.sh /opt/
COPY my_init.d/prepare-aiidalab.sh /etc/my_init.d/80_prepare-aiidalab.sh

# Install the aiidalab-home app.
ARG aiidalab_home_version=v22.01.0
ARG aiidalab_home_version=v22.08.0
RUN git clone https://github.com/aiidalab/aiidalab-home && cd aiidalab-home && git checkout $aiidalab_home_version
RUN chmod 774 aiidalab-home

Expand Down
3 changes: 0 additions & 3 deletions opt/prepare-aiidalab.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ if [[ ${INITIAL_SETUP} == 1 ]]; then
done
fi

# Update reentry.
reentry scan

# Clear user trash directory.
if [ -e /home/${SYSTEM_USER}/.trash ]; then
rm -rf /home/${SYSTEM_USER}/.trash/*
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
aiidalab==22.7.1
aiidalab==22.8.0
aiidalab-widgets-base~=1.3.4
binaryornot~=0.4
bokeh~=2.0
Expand Down

0 comments on commit 031c604

Please sign in to comment.