From 749252acec3d538495f3a02c1a798cbab6786d8d Mon Sep 17 00:00:00 2001 From: Daniel Bast <2790401+dbast@users.noreply.github.com> Date: Thu, 22 Jul 2021 18:49:31 +0200 Subject: [PATCH 1/2] Use tags as calculated by the docker metadata action for alpine --- .github/workflows/miniconda_alpine_ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/miniconda_alpine_ci.yml b/.github/workflows/miniconda_alpine_ci.yml index 4e427a23..35e809e0 100644 --- a/.github/workflows/miniconda_alpine_ci.yml +++ b/.github/workflows/miniconda_alpine_ci.yml @@ -48,5 +48,5 @@ jobs: context: ./miniconda3/alpine builder: ${{ steps.buildx.outputs.name }} file: ./miniconda3/alpine/Dockerfile - tags: continuumio/miniconda3/alpine:latest + tags: ${{ steps.meta.outputs.tags }} push: ${{ github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags') }} From 73419428ea1da1acab6ff4359c80a5fb7a720afb Mon Sep 17 00:00:00 2001 From: Daniel Bast <2790401+dbast@users.noreply.github.com> Date: Thu, 22 Jul 2021 19:04:47 +0200 Subject: [PATCH 2/2] Add procps (containing ps) instead of psmisc to alpine image --- miniconda3/alpine/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/miniconda3/alpine/Dockerfile b/miniconda3/alpine/Dockerfile index a60f59a7..8b1226b9 100644 --- a/miniconda3/alpine/Dockerfile +++ b/miniconda3/alpine/Dockerfile @@ -57,7 +57,7 @@ ARG CONDA_VERSION=py39_4.10.3 ARG SHA256SUM=1ea2f885b4dbc3098662845560bc64271eb17085387a70c2ba3f29fff6f8d52f # hadolint ignore=DL3018 -RUN apk add -q --no-cache bash psmisc && \ +RUN apk add -q --no-cache bash procps && \ wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VERSION}-Linux-x86_64.sh -O miniconda.sh && \ echo "${SHA256SUM} miniconda.sh" > miniconda.sha256 && \ if ! sha256sum -cs miniconda.sha256; then exit 1; fi && \