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.

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

Update base image to python-3.11.3 #455

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
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 build.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"variable": {
"PYTHON_VERSION": {
"default": "3.9.13"
"default": "3.11.3"
},
"PGSQL_VERSION": {
"default": "15"
Expand Down
7 changes: 3 additions & 4 deletions stack/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,10 @@ ENV PIP_CONSTRAINT /opt/requirements.txt
# Ensure that pip installs packages to ~/.local by default
ENV PIP_USER 1

# Upgrade pip to latest
RUN mamba update -y pip && mamba clean --all -f -y

# Upgrade pip and mamba to latest
# Install aiida-core and other shared requirements.
RUN mamba install --yes \
RUN mamba update -y pip mamba zstandard && \
danielhollas marked this conversation as resolved.
Show resolved Hide resolved
mamba install --yes \
aiida-core==${AIIDA_VERSION} \
mamba-bash-completion \
&& mamba clean --all -f -y && \
Expand Down
2 changes: 1 addition & 1 deletion stack/full-stack/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ COPY --from=base "${CONDA_DIR}/envs/aiida-core-services" "${CONDA_DIR}/envs/aiid
COPY --from=base /usr/local/bin/before-notebook.d /usr/local/bin/before-notebook.d

RUN fix-permissions "${CONDA_DIR}"
RUN fix-permissions "/home/${NB_USER}/.aiida"
RUN fix-permissions "/home/${NB_USER}"

USER ${NB_USER}

Expand Down
15 changes: 9 additions & 6 deletions stack/lab/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ WORKDIR /opt/

# Install aiidalab package
ARG AIIDALAB_VERSION
RUN mamba install --yes \
aiidalab=${AIIDALAB_VERSION} \
&& mamba clean --all -f -y && \
fix-permissions "${CONDA_DIR}" && \
fix-permissions "/home/${NB_USER}"
RUN pip install --no-user aiidalab@git+https://github.com/aiidalab/aiidalab.git
#RUN mamba install --yes \
# aiidalab=${AIIDALAB_VERSION} \
# && mamba clean --all -f -y && \
# fix-permissions "${CONDA_DIR}" && \
# fix-permissions "/home/${NB_USER}"

# Pin aiidalab version.
RUN echo "aiidalab==${AIIDALAB_VERSION}" >> /opt/requirements.txt
Expand Down Expand Up @@ -77,7 +78,7 @@ WORKDIR "/home/${NB_USER}"

RUN mkdir -p /home/${NB_USER}/apps

# When a Jupyter notebook server looses a connection to the frontend,
# NOTE1: When a Jupyter notebook server looses a connection to the frontend,
# it keeps the messages in a buffer. If there is a background thread running
# and trying to update the frontend, the buffer grows indefinitely,
# eventually consuming all available RAM.
Expand All @@ -87,8 +88,10 @@ RUN mkdir -p /home/${NB_USER}/apps
# but that may come with other problems for people with flaky internet connections.
# Instead, here we configure Jupyter to kill all kernels that have been alive for
# more than 12 hours. We also close all inactive terminals after 10 minutes.
# NOTE2: show_banner=False disables the banner for upgrading to Notebook 7.
ENV NOTEBOOK_ARGS \
"--NotebookApp.default_url='/apps/apps/home/start.ipynb'" \
"--NotebookApp.show_banner=False" \
"--ContentsManager.allow_hidden=True" \
"--MappingKernelManager.buffer_offline_messages=True" \
"--MappingKernelManager.cull_busy=True" \
Expand Down
Loading