From 07f26bdb7d68eda1c1f84ee3cc806c588c1f6f3a Mon Sep 17 00:00:00 2001 From: Andrej Dundovic Date: Mon, 18 Nov 2024 20:28:01 +0100 Subject: [PATCH] update Dockerfile with newest package names --- Dockerfile | 10 +++++----- include/hermes/CacheTools.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 81e060e5..15707d1d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ ARG REGISTRY=quay.io ARG OWNER=cosmicrays ARG BUILD_CONTAINER=$REGISTRY/jupyter/docker-stacks-foundation ARG RUNNER_CONTAINER=$REGISTRY/jupyter/scipy-notebook -FROM $BUILD_CONTAINER as builder +FROM $BUILD_CONTAINER AS builder LABEL maintainer="HERMES Developers " @@ -34,7 +34,7 @@ RUN mamba install --yes \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}" -ENV PATH /opt/conda/bin:$PATH +ENV PATH=/opt/conda/bin:$PATH RUN /bin/bash -c "source activate base" && \ mkdir -p /tmp/hermes WORKDIR /tmp/hermes @@ -54,15 +54,15 @@ RUN mkdir build-container && \ fix-permissions "${CONDA_DIR}" && \ fix-permissions "/home/${NB_USER}" -FROM $RUNNER_CONTAINER as runner +FROM $RUNNER_CONTAINER AS runner USER root RUN apt-get update --yes && \ apt-get install --yes --no-install-recommends \ libgsl27 \ - libfftw3-3 \ - libcfitsio9 && \ + libfftw3-single3 libfftw3-double3 \ + libcfitsio10t64 && \ apt-get clean && rm -rf /var/lib/apt/lists/* COPY --from=builder ${CONDA_DIR} ${CONDA_DIR} diff --git a/include/hermes/CacheTools.h b/include/hermes/CacheTools.h index d79d6ce8..264babf6 100644 --- a/include/hermes/CacheTools.h +++ b/include/hermes/CacheTools.h @@ -27,7 +27,7 @@ inline void hash_combine(std::size_t &seed, const T &v) { seed ^= hasher(v) + 0x9e3779b9 + (seed << 6) + (seed >> 2); } -struct pair_hash : public std::unary_function { +struct pair_hash { std::size_t operator()(const tPairKey &p) const { auto h1 = std::hash{}(p.first); auto h2 = std::hash{}(p.second);