From 88332b4d23ff4aab89152290958a8a0fe657d7c6 Mon Sep 17 00:00:00 2001 From: Daniel Hollas Date: Tue, 16 Jul 2024 15:34:34 +0100 Subject: [PATCH] Test new erlang for arm64 --- build.json | 2 +- stack/base-with-services/Dockerfile | 1 + stack/base/Dockerfile | 5 +---- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/build.json b/build.json index c5d110f4..a16b5848 100644 --- a/build.json +++ b/build.json @@ -7,7 +7,7 @@ "default": "15" }, "RMQ_VERSION": { - "default": "3.9.13" + "default": "3.13.2" }, "AIIDA_VERSION": { "default": "2.5.1" diff --git a/stack/base-with-services/Dockerfile b/stack/base-with-services/Dockerfile index 2230bd43..6605430c 100644 --- a/stack/base-with-services/Dockerfile +++ b/stack/base-with-services/Dockerfile @@ -35,6 +35,7 @@ RUN if [ "$TARGETARCH" = "amd64" ]; then \ fix-permissions "${CONDA_DIR}"; \ elif [ "$TARGETARCH" = "arm64" ]; then \ mamba create -p /opt/conda/envs/aiida-core-services --yes \ + erlang=26.2.5 \ postgresql=${PGSQL_VERSION} && \ mamba clean --all -f -y && \ wget -c https://github.com/rabbitmq/rabbitmq-server/releases/download/v${RMQ_VERSION}/rabbitmq-server-generic-unix-${RMQ_VERSION}.tar.xz && \ diff --git a/stack/base/Dockerfile b/stack/base/Dockerfile index 25e5091d..7c699d12 100644 --- a/stack/base/Dockerfile +++ b/stack/base/Dockerfile @@ -12,12 +12,9 @@ USER root # povray: rendering engine used in aiidalab-widgets-base ENV EXTRA_APT_PACKAGES "curl povray rsync build-essential" -# For ARM64 we need to install erlang as it is not available on conda-forge -# (this is needed later as rabbitmq dependency in base-with-services image, -# but we install it here so that we don't have to invoke apt multiple times. ARG TARGETARCH RUN if [ "$TARGETARCH" = "arm64" ]; then \ - EXTRA_APT_PACKAGES="erlang libhdf5-serial-dev pkg-config ${EXTRA_APT_PACKAGES}"; \ + EXTRA_APT_PACKAGES="libhdf5-serial-dev pkg-config ${EXTRA_APT_PACKAGES}"; \ fi;\ apt-get update --yes && \ apt-get install --yes --no-install-recommends ${EXTRA_APT_PACKAGES} && \