Skip to content

Commit

Permalink
Devops: Do not pin the mamba version (#6466)
Browse files Browse the repository at this point in the history
* Remove pin of mamba version
* Set `PIP_USER` as default
* Remove double install of `xz-utils`
  • Loading branch information
danielhollas authored Jun 7, 2024
1 parent 1b4a19a commit 82bba13
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
8 changes: 3 additions & 5 deletions .docker/aiida-core-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,6 @@ USER ${SYSTEM_UID}
# Pin python version here
ARG PYTHON_VERSION

# Pin mamba version here
ARG MAMBA_VERSION

# Download and install Micromamba, and initialize Conda prefix.
# <https://github.com/mamba-org/mamba#micromamba>
# Similar projects using Micromamba:
Expand Down Expand Up @@ -137,7 +134,7 @@ RUN set -x && \
--prefix="${CONDA_DIR}" \
--yes \
"${PYTHON_SPECIFIER}" \
"mamba=${MAMBA_VERSION}" && \
mamba && \
rm micromamba && \
# Pin major.minor version of python
mamba list python | grep '^python ' | tr -s ' ' | cut -d ' ' -f 1,2 >> "${CONDA_DIR}/conda-meta/pinned" && \
Expand All @@ -146,8 +143,9 @@ RUN set -x && \
fix-permissions "/home/${SYSTEM_USER}"

# Add ~/.local/bin to PATH where the dependencies get installed via pip
# This require the package installed with `--user` flag in pip
# This require the package installed with `--user` flag in pip, which we set as default.
ENV PATH=${PATH}:/home/${SYSTEM_USER}/.local/bin
ENV PIP_USER 1

# Switch to root to install AiiDA and set AiiDA as service
# Install AiiDA from source code
Expand Down
3 changes: 1 addition & 2 deletions .docker/aiida-core-with-services/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ RUN mamba install --yes \
# Install erlang.
RUN apt-get update --yes && \
apt-get install --yes --no-install-recommends \
erlang \
xz-utils && \
erlang && \
apt-get clean && rm -rf /var/lib/apt/lists/* && \
# Install rabbitmq.
wget -c --no-check-certificate https://github.com/rabbitmq/rabbitmq-server/releases/download/v${RMQ_VERSION}/rabbitmq-server-generic-unix-${RMQ_VERSION}.tar.xz && \
Expand Down
1 change: 0 additions & 1 deletion .docker/docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ target "aiida-core-base" {
platforms = "${PLATFORMS}"
args = {
"PYTHON_VERSION" = "${PYTHON_VERSION}"
"MAMBA_VERSION" = "1.5.2"
}
}
target "aiida-core-with-services" {
Expand Down

0 comments on commit 82bba13

Please sign in to comment.