Skip to content

Commit

Permalink
update Dockerfile with newest package names
Browse files Browse the repository at this point in the history
  • Loading branch information
Andrej Dundovic committed Nov 18, 2024
1 parent be59e7e commit 07f26bd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>"

Expand Down Expand Up @@ -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
Expand All @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion include/hermes/CacheTools.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<std::size_t, std::size_t> {
struct pair_hash {
std::size_t operator()(const tPairKey &p) const {
auto h1 = std::hash<double>{}(p.first);
auto h2 = std::hash<double>{}(p.second);
Expand Down

0 comments on commit 07f26bd

Please sign in to comment.