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.

Sign up for GitHub

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

Docker image tweaks #6466

Merged
merged 2 commits into from
Jun 7, 2024
Merged

Docker image tweaks #6466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09c84eb
Don't pin mamba version, set PIP_USER as default
danielhollas Jun 4, 2024
26b9689
Don't install xz-utils twice
danielhollas Jun 4, 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
8 changes: 3 additions & 5 deletions .docker/aiida-core-base/Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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 && \
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Already installed in aiida-core-base

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
View file
Open in desktop
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