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 28 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
d62a24b
Update base image to python-3.10.11
danielhollas May 14, 2024
e52ca1e
3.11.3
danielhollas Jun 12, 2024
4a77ab9
Update mamba
danielhollas Jun 20, 2024
4985362
Update zstandard
danielhollas Jun 20, 2024
5ce75da
Install aiidalab from git
danielhollas Jun 21, 2024
dd63d3b
Update stack/base/Dockerfile
danielhollas Jun 22, 2024
3fe3513
Install aiidalab from fork
danielhollas Jun 22, 2024
01e7258
Merge branch 'main' into python-3.10.11
danielhollas Jul 4, 2024
3f28b84
Bump aiidalab to 24.07.0
danielhollas Jul 7, 2024
fcceb68
Fix aiidalab version
danielhollas Jul 7, 2024
ea3e431
Merge branch 'main' into python-3.10.11
danielhollas Jul 14, 2024
bda137e
Merge branch 'main' into python-3.10.11
danielhollas Jul 18, 2024
990d9bc
Merge branch 'main' into python-3.10.11
danielhollas Aug 7, 2024
4d11db0
Merge branch 'main' into python-3.10.11
danielhollas Aug 29, 2024
0ac4e15
Merge branch 'main' into python-3.10.11
danielhollas Sep 6, 2024
5ae2e64
Remove traitlets install
danielhollas Sep 6, 2024
6eecfe3
Merge branch 'main' into python-3.10.11
danielhollas Sep 8, 2024
d42e04c
Do not update zstandard, update mamba
danielhollas Sep 8, 2024
ac9850c
Revert full-stack fix-permission change
danielhollas Sep 8, 2024
98d976c
Update zstandard
danielhollas Sep 8, 2024
e830af4
Update comment
danielhollas Sep 8, 2024
9f65fae
Try installing mamba==2.0.0rc4
danielhollas Sep 8, 2024
f77b56a
Revert "Try installing mamba==2.0.0rc4"
danielhollas Sep 8, 2024
7eb857e
Merge branch 'main' into python-3.10.11
danielhollas Oct 24, 2024
cd167e5
Pin mamba version to 1.5, 2.0 contains breaking changes
danielhollas Oct 24, 2024
674e961
Run arm tests
danielhollas Nov 2, 2024
aeaa700
to-be-reverted: Test aiidalab-home fix
danielhollas Nov 19, 2024
4e02221
Merge branch 'main' into python-3.10.11
danielhollas Nov 19, 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
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ jobs:
# To save arm64 runner resources, we run the tests only on main
# and only for full-stack image (same for integration tests below).
test-arm64:
if: >-
github.repository == 'aiidalab/aiidalab-docker-stack'
&& (github.ref_type == 'tag' || github.ref_name == 'main')
#if: >-
# github.repository == 'aiidalab/aiidalab-docker-stack'
# && (github.ref_type == 'tag' || github.ref_name == 'main')
needs: build
uses: ./.github/workflows/test.yml
with:
Expand All @@ -80,9 +80,9 @@ jobs:
runner: [ubuntu-22.04, buildjet-4vcpu-ubuntu-2204-arm]
isPR:
- ${{ github.event_name == 'pull_request' }}
exclude:
- isPR: true
runner: buildjet-4vcpu-ubuntu-2204-arm
#exclude:
# - isPR: true
# runner: buildjet-4vcpu-ubuntu-2204-arm

uses: ./.github/workflows/test.yml
with:
Expand Down
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
5 changes: 3 additions & 2 deletions stack/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,13 @@ COPY pip.conf "${CONDA_DIR}/pip.conf"
# Upgrade pip and mamba to latest
# Update async_generator, certipy to satisfy `pip check`
# https://github.com/aiidalab/aiidalab-docker-stack/issues/490
# Update zstandard, without this the `mamba install` command fails for unknown reason.
# Install aiida-core and other shared requirements.
RUN mamba update -y pip async_generator certipy && \
RUN mamba update -y pip zstandard async_generator certipy && \
mamba install --yes \
mamba=1.5 \
aiida-core==${AIIDA_VERSION} \
mamba-bash-completion \
traitlets=5.9.0 \
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The base image already comes with traitlets==5.9.0

&& mamba clean --all -f -y && \
fix-permissions "${CONDA_DIR}"

Expand Down
7 changes: 4 additions & 3 deletions stack/lab/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@ RUN echo 'eval "$(_AIIDALAB_COMPLETE=bash_source aiidalab)"' >> "${CONDA_DIR}/et

# Install the aiidalab-home app.
ARG AIIDALAB_HOME_VERSION
RUN git clone https://github.com/aiidalab/aiidalab-home && \
RUN git clone --branch fix/single_app_crash https://github.com/aiidalab/aiidalab-home && \
cd aiidalab-home && \
git checkout v"${AIIDALAB_HOME_VERSION}" && \
pip install --no-user --quiet --no-cache-dir "./" && \
fix-permissions "./" && \
fix-permissions "${CONDA_DIR}" && \
Expand Down Expand Up @@ -77,7 +76,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 +86,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