Merge branch 'main' into dependabot/github_actions/docker/metadata-ac…

…tion-5.6.1
mamba-org · Dec 22, 2024 · a193b5e · a193b5e
2 parents 29f1def + 42fd569
commit a193b5e
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 14 deletions.
diff --git 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).
 
+## 16 December 2024
+
+- Updated to micromamba version 2.0.5
+
 ## 25 November 2024
 
 - Updated to micromamba version 2.0.4

diff --git a/alpine.Dockerfile b/alpine.Dockerfile
@@ -4,7 +4,7 @@ ARG BASE_IMAGE=frolvlad/alpine-glibc:alpine-3.20
 # curl and openssl installed
 FROM $BASE_IMAGE AS stage1
 ARG TARGETARCH
-ARG VERSION=2.0.4
+ARG VERSION=2.0.5
 # hadolint ignore=DL3018
 RUN apk add --no-cache \
       bash \

diff --git a/debian.Dockerfile b/debian.Dockerfile
@@ -4,7 +4,7 @@ ARG BASE_IMAGE=debian:12-slim
 # curl and openssl installed
 FROM $BASE_IMAGE AS stage1
 ARG TARGETARCH
-ARG VERSION=2.0.4
+ARG VERSION=2.0.5
 RUN apt-get update && apt-get install -y --no-install-recommends \
       bzip2 \
       ca-certificates \

diff --git a/docs/conf.py b/docs/conf.py
@@ -9,7 +9,7 @@
 project = 'micromamba-docker'
 copyright = '2023-2024, micromamba documentation contributors'
 author = 'micromamba documentation contributors'
-release = '2.0.4'
+release = '2.0.5'
 
 # -- 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
@@ -1,5 +1,5 @@
 # bring in the micromamba image so we can copy files from it
-FROM mambaorg/micromamba:2.0.4 as micromamba
+FROM mambaorg/micromamba:2.0.5 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
@@ -1,4 +1,4 @@
-FROM mambaorg/micromamba:2.0.4
+FROM mambaorg/micromamba:2.0.5
 
 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
@@ -1,4 +1,4 @@
-FROM mambaorg/micromamba:2.0.4
+FROM mambaorg/micromamba:2.0.5
 
 RUN micromamba install -y -n base -c conda-forge \
        pyopenssl=24.3.0 \

diff --git 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:2.0.4 /bin/bash -c "\
+   mambaorg/micromamba:2.0.5 /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
@@ -1,4 +1,4 @@
-FROM mambaorg/micromamba:2.0.4
+FROM mambaorg/micromamba:2.0.5
 
 COPY --chown=$MAMBA_USER:$MAMBA_USER env.lock /tmp/env.lock
 RUN micromamba install --name base --yes --file /tmp/env.lock \

diff --git a/examples/modify_username/Dockerfile b/examples/modify_username/Dockerfile
@@ -1,4 +1,4 @@
-FROM mambaorg/micromamba:2.0.4
+FROM mambaorg/micromamba:2.0.5
 
 ARG NEW_MAMBA_USER=new-username
 ARG NEW_MAMBA_USER_ID=57440

diff --git a/examples/multi_env/Dockerfile b/examples/multi_env/Dockerfile
@@ -1,4 +1,4 @@
-FROM mambaorg/micromamba:2.0.4
+FROM mambaorg/micromamba:2.0.5
 
 COPY --chown=$MAMBA_USER:$MAMBA_USER env1.yaml /tmp/env1.yaml
 COPY --chown=$MAMBA_USER:$MAMBA_USER env2.yaml /tmp/env2.yaml

diff --git a/examples/new_lock/Dockerfile b/examples/new_lock/Dockerfile
@@ -1,4 +1,4 @@
-FROM mambaorg/micromamba:2.0.4
+FROM mambaorg/micromamba:2.0.5
 
 COPY --chown=$MAMBA_USER:$MAMBA_USER env.lock /tmp/env.lock
 RUN micromamba create --name my_env_name --yes --file /tmp/env.lock \

diff --git a/examples/run_activate/Dockerfile b/examples/run_activate/Dockerfile
@@ -1,4 +1,4 @@
-FROM mambaorg/micromamba:2.0.4
+FROM mambaorg/micromamba:2.0.5
 
 COPY --chown=$MAMBA_USER:$MAMBA_USER env.yaml /tmp/env.yaml
 RUN micromamba install --yes --file /tmp/env.yaml && \

diff --git a/examples/yaml_spec/Dockerfile b/examples/yaml_spec/Dockerfile
@@ -1,4 +1,4 @@
-FROM mambaorg/micromamba:2.0.4
+FROM mambaorg/micromamba:2.0.5
 
 COPY --chown=$MAMBA_USER:$MAMBA_USER env.yaml /tmp/env.yaml
 RUN micromamba install -y -n base -f /tmp/env.yaml && \

diff --git a/fedora.Dockerfile b/fedora.Dockerfile
@@ -4,7 +4,7 @@ ARG BASE_IMAGE=public.ecr.aws/amazonlinux/amazonlinux:2023
 # curl and openssl installed
 FROM $BASE_IMAGE AS stage1
 ARG TARGETARCH
-ARG VERSION=2.0.4
+ARG VERSION=2.0.5
 # hadolint ignore=DL3033
 RUN yum update -y && yum install -y \
       bzip2 \