Skip to content

Commit

Permalink
Test new erlang for arm64
Browse files Browse the repository at this point in the history
  • Loading branch information
danielhollas committed Jul 16, 2024
1 parent 36a565e commit 88332b4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion build.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"default": "15"
},
"RMQ_VERSION": {
"default": "3.9.13"
"default": "3.13.2"
},
"AIIDA_VERSION": {
"default": "2.5.1"
Expand Down
1 change: 1 addition & 0 deletions stack/base-with-services/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
5 changes: 1 addition & 4 deletions stack/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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} && \
Expand Down

0 comments on commit 88332b4

Please sign in to comment.