From 185d475775ed4116db332d32d810172ba8b72f4c Mon Sep 17 00:00:00 2001 From: wholtz Date: Tue, 14 Nov 2023 18:02:57 +0000 Subject: [PATCH] Update to micromamba version 1.5.3 --- CHANGELOG.md | 4 ++++ Dockerfile | 2 +- docs/conf.py | 2 +- examples/add_micromamba/Dockerfile | 2 +- examples/apt_install/Dockerfile | 2 +- examples/cmdline_spec/Dockerfile | 2 +- examples/generate_lock/generate_lock.sh | 2 +- examples/install_lock/Dockerfile | 2 +- examples/modify_username/Dockerfile | 2 +- examples/multi_env/Dockerfile | 2 +- examples/new_lock/Dockerfile | 2 +- examples/run_activate/Dockerfile | 2 +- examples/yaml_spec/Dockerfile | 2 +- 13 files changed, 16 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3fccac9..278e895 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ This change log covers changes to the docker image and does not include [changes to the micromamba program](https://github.com/mamba-org/mamba/blob/main/CHANGELOG.md). +## 14 November 2023 + +- Updated to micromamba version 1.5.3 + ## 5 November 2023 - Added `/usr/local/bin/_apptainer_shell.sh` for use with diff --git a/Dockerfile b/Dockerfile index 5eaa69d..fd9c023 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG BASE_IMAGE=debian:bookworm-slim # Mutli-stage build to keep final image small. Otherwise end up with # curl and openssl installed FROM --platform=$BUILDPLATFORM $BASE_IMAGE AS stage1 -ARG VERSION=1.5.1 +ARG VERSION=1.5.3 # hadolint ignore=DL3018 RUN if grep -q '^ID=alpine$' /etc/os-release; then \ diff --git a/docs/conf.py b/docs/conf.py index 775022e..503f2e5 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -9,7 +9,7 @@ project = 'micromamba-docker' copyright = '2023, micromamba documentation contributors' author = 'micromamba documentation contributors' -release = '1.5.1' +release = '1.5.3' # -- General configuration --------------------------------------------------- # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration diff --git a/examples/add_micromamba/Dockerfile b/examples/add_micromamba/Dockerfile index 75e9dca..508c041 100644 --- a/examples/add_micromamba/Dockerfile +++ b/examples/add_micromamba/Dockerfile @@ -1,5 +1,5 @@ # bring in the micromamba image so we can copy files from it -FROM mambaorg/micromamba:1.5.1 as micromamba +FROM mambaorg/micromamba:1.5.3 as micromamba # This is the image we are going add micromaba to: FROM tomcat:9-jdk17-temurin-focal diff --git a/examples/apt_install/Dockerfile b/examples/apt_install/Dockerfile index 4c4ed11..8b31bc4 100644 --- a/examples/apt_install/Dockerfile +++ b/examples/apt_install/Dockerfile @@ -1,4 +1,4 @@ -FROM mambaorg/micromamba:1.5.1 +FROM mambaorg/micromamba:1.5.3 COPY --chown=$MAMBA_USER:$MAMBA_USER env.yaml /tmp/env.yaml RUN micromamba install -y -n base -f /tmp/env.yaml && \ diff --git a/examples/cmdline_spec/Dockerfile b/examples/cmdline_spec/Dockerfile index e958137..08eff92 100644 --- a/examples/cmdline_spec/Dockerfile +++ b/examples/cmdline_spec/Dockerfile @@ -1,4 +1,4 @@ -FROM mambaorg/micromamba:1.5.1 +FROM mambaorg/micromamba:1.5.3 RUN micromamba install -y -n base -c conda-forge \ pyopenssl=20.0.1 \ python=3.9.1 \ diff --git a/examples/generate_lock/generate_lock.sh b/examples/generate_lock/generate_lock.sh index 3de4394..a3f8cbb 100644 --- a/examples/generate_lock/generate_lock.sh +++ b/examples/generate_lock/generate_lock.sh @@ -1,4 +1,4 @@ docker run --rm -v "$(pwd):/tmp" \ - mambaorg/micromamba:1.5.1 /bin/bash -c "\ + mambaorg/micromamba:1.5.3 /bin/bash -c "\ micromamba create --yes --name new_env --file env.yaml \ && micromamba env export --name new_env --explicit" > env.lock diff --git a/examples/install_lock/Dockerfile b/examples/install_lock/Dockerfile index 68f1d7f..2a010e1 100644 --- a/examples/install_lock/Dockerfile +++ b/examples/install_lock/Dockerfile @@ -1,4 +1,4 @@ -FROM mambaorg/micromamba:1.5.1 +FROM mambaorg/micromamba:1.5.3 COPY --chown=$MAMBA_USER:$MAMBA_USER env.lock /tmp/env.lock RUN micromamba install --name base --yes --file /tmp/env.lock \ && micromamba clean --all --yes diff --git a/examples/modify_username/Dockerfile b/examples/modify_username/Dockerfile index 6b33745..7311290 100644 --- a/examples/modify_username/Dockerfile +++ b/examples/modify_username/Dockerfile @@ -1,4 +1,4 @@ -FROM mambaorg/micromamba:1.5.1 +FROM mambaorg/micromamba:1.5.3 ARG NEW_MAMBA_USER=new-username ARG NEW_MAMBA_USER_ID=57440 ARG NEW_MAMBA_USER_GID=57440 diff --git a/examples/multi_env/Dockerfile b/examples/multi_env/Dockerfile index 3a1f8f8..8b5712e 100644 --- a/examples/multi_env/Dockerfile +++ b/examples/multi_env/Dockerfile @@ -1,4 +1,4 @@ -FROM mambaorg/micromamba:1.5.1 +FROM mambaorg/micromamba:1.5.3 COPY --chown=$MAMBA_USER:$MAMBA_USER env1.yaml /tmp/env1.yaml COPY --chown=$MAMBA_USER:$MAMBA_USER env2.yaml /tmp/env2.yaml RUN micromamba create -y -f /tmp/env1.yaml && \ diff --git a/examples/new_lock/Dockerfile b/examples/new_lock/Dockerfile index 4f62ed5..da884d9 100644 --- a/examples/new_lock/Dockerfile +++ b/examples/new_lock/Dockerfile @@ -1,4 +1,4 @@ -FROM mambaorg/micromamba:1.5.1 +FROM mambaorg/micromamba:1.5.3 COPY --chown=$MAMBA_USER:$MAMBA_USER env.lock /tmp/env.lock RUN micromamba create --name my_env_name --yes --file /tmp/env.lock \ && micromamba clean --all --yes diff --git a/examples/run_activate/Dockerfile b/examples/run_activate/Dockerfile index 6d24f55..a579ad5 100644 --- a/examples/run_activate/Dockerfile +++ b/examples/run_activate/Dockerfile @@ -1,4 +1,4 @@ -FROM mambaorg/micromamba:1.5.1 +FROM mambaorg/micromamba:1.5.3 COPY --chown=$MAMBA_USER:$MAMBA_USER env.yaml /tmp/env.yaml RUN micromamba install --yes --file /tmp/env.yaml && \ micromamba clean --all --yes diff --git a/examples/yaml_spec/Dockerfile b/examples/yaml_spec/Dockerfile index 9f6ba28..e062a19 100644 --- a/examples/yaml_spec/Dockerfile +++ b/examples/yaml_spec/Dockerfile @@ -1,4 +1,4 @@ -FROM mambaorg/micromamba:1.5.1 +FROM mambaorg/micromamba:1.5.3 COPY --chown=$MAMBA_USER:$MAMBA_USER env.yaml /tmp/env.yaml RUN micromamba install -y -n base -f /tmp/env.yaml && \ micromamba clean --all --yes