From 4f83edcf7c0adf6b812fe53ac2cb35c463a9f677 Mon Sep 17 00:00:00 2001 From: David Schultz Date: Mon, 25 Sep 2023 16:37:26 -0500 Subject: [PATCH] update cxx version and fix which branch we install (#13) --- install_icetray/Dockerfile_install | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install_icetray/Dockerfile_install b/install_icetray/Dockerfile_install index 2fb1223..7314d64 100644 --- a/install_icetray/Dockerfile_install +++ b/install_icetray/Dockerfile_install @@ -1,7 +1,7 @@ ARG TARGET_UBUNTU=ubuntu20.04 FROM icecube/icetray-base:devel-${TARGET_UBUNTU} as install -ARG CMAKE_CXX_STANDARD=14 +ARG CMAKE_CXX_STANDARD=17 ARG VERSION=v1.7.2 @@ -23,9 +23,9 @@ RUN echo $VERSION RUN mkdir /usr/local/icetray_src WORKDIR /usr/local/icetray_src -RUN git init && git config advice.detachedHead false +RUN git init -b ${VERSION} && git config advice.detachedHead false RUN --mount=type=secret,id=GHTOKEN GHTOKEN=$(cat /run/secrets/GHTOKEN) && curl -sS -f -I -H "Authorization: token ${GHTOKEN}" https://api.github.com && \ - git pull --depth 1 https://${GHTOKEN}@github.com/icecube/icetray.git + git pull --depth 1 https://${GHTOKEN}@github.com/icecube/icetray.git ${VERSION} RUN echo ${VERSION} > /usr/local/icetray_src/version_tag RUN echo ${CMAKE_CXX_STANDARD} > /usr/local/icetray_src/cxx_standard