From 5c1f52896e85b843f93e36614b70aaca0bfe2a60 Mon Sep 17 00:00:00 2001 From: Chuck McAndrew <6248903+dcmcand@users.noreply.github.com> Date: Tue, 17 Oct 2023 14:53:02 -0400 Subject: [PATCH] remove depreciated tag and set TZ to UTC --- conda-store-server/Dockerfile | 4 ++-- conda-store/Dockerfile | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/conda-store-server/Dockerfile b/conda-store-server/Dockerfile index 97620faab..c5484c928 100644 --- a/conda-store-server/Dockerfile +++ b/conda-store-server/Dockerfile @@ -1,9 +1,9 @@ -FROM --platform=linux/amd64 condaforge/mambaforge:23.3.1-1 as base +FROM condaforge/mambaforge:23.3.1-1 as base LABEL org.opencontainers.image.authors="conda-store development team" ENV PATH=/opt/conda/condabin:/opt/conda/envs/conda-store-server/bin:/opt/conda/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PATH} -ENV TZ=America/New_York +ENV TZ=Etc/UTC RUN apt-get update && \ # https://docs.anaconda.org/anaconda/install/linux/#installing-on-linux diff --git a/conda-store/Dockerfile b/conda-store/Dockerfile index 8a594516c..e576bdf05 100644 --- a/conda-store/Dockerfile +++ b/conda-store/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=linux/amd64 condaforge/mambaforge:23.3.1-1 as base +FROM condaforge/mambaforge:23.3.1-1 as base LABEL org.opencontainers.image.authors="conda-store development team" @@ -15,7 +15,9 @@ RUN apt-get update && \ COPY environment.yaml /opt/conda-store/environment.yaml -RUN mamba env create -f /opt/conda-store/environment.yaml && mamba clean --all -y && conda clean --force-pkgs-dirs +RUN mamba env create -f /opt/conda-store/environment.yaml && \ +mamba clean --all -y && \ +conda clean --force-pkgs-dirs ENV PATH=/opt/conda/condabin:/opt/conda/envs/conda-store/bin:/opt/conda/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PATH}