diff --git a/scripts/docker/Dockerfile.gcc.full b/scripts/docker/Dockerfile.gcc.full index 88040137147668bf06f7a58241c57b08335a4355..a241e31ac54fa8d30a59c1486765e47993036598 100644 --- a/scripts/docker/Dockerfile.gcc.full +++ b/scripts/docker/Dockerfile.gcc.full @@ -1,6 +1,6 @@ FROM ubuntu:17.10 -# Generated with https://github.com/ufz/ogs-container-maker/commit/9f130d9 +# Generated with https://github.com/ufz/ogs-container-maker/commit/1f5dba5 RUN apt-get update -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ @@ -47,7 +47,8 @@ RUN apt-get update -y && \ RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://cmake.org/files/v3.13/cmake-3.13.4-Linux-x86_64.sh && \ /bin/sh /var/tmp/cmake-3.13.4-Linux-x86_64.sh --prefix=/usr/local --skip-license && \ rm -rf /var/tmp/cmake-3.13.4-Linux-x86_64.sh -RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash +RUN apt-get update && \ + curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash RUN apt-get update -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends software-properties-common && \ apt-add-repository ppa:git-core/ppa -y && \ @@ -77,15 +78,6 @@ LABEL org.opengeosys.pm=conan \ org.opengeosys.pm.conan.user_home=/opt/conan \ org.opengeosys.pm.conan.version=1.12.2 -# CVode version 2.8.2 - -RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://github.com/ufz/cvode/archive/2.8.2.tar.gz && \ - mkdir -p /var/tmp && tar -x -f /var/tmp/2.8.2.tar.gz -C /var/tmp -z && \ - mkdir -p /var/tmp/build && cd /var/tmp/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/cvode -DEXAMPLES_INSTALL=OFF -DBUILD_SHARED_LIBS=OFF /var/tmp/cvode-2.8.2 && \ - cmake --build /var/tmp/build --target install -- -j$(nproc) && \ - rm -rf /var/tmp/2.8.2.tar.gz /var/tmp/build /var/tmp/cvode-2.8.2 -ENV CVODE_ROOT=/usr/local/cvode - # cppcheck version 1.83 RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://github.com/danmar/cppcheck/archive/1.83.tar.gz && \ diff --git a/scripts/docker/Dockerfile.gcc.gui b/scripts/docker/Dockerfile.gcc.gui index 99712f98e317509eac4d132f5586c6c7f5cc97a8..3263de16f33bed7badf0f581e1f127d77a17558b 100644 --- a/scripts/docker/Dockerfile.gcc.gui +++ b/scripts/docker/Dockerfile.gcc.gui @@ -1,6 +1,6 @@ FROM ubuntu:17.10 -# Generated with https://github.com/ufz/ogs-container-maker/commit/9f130d9 +# Generated with https://github.com/ufz/ogs-container-maker/commit/1f5dba5 RUN apt-get update -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ @@ -47,7 +47,8 @@ RUN apt-get update -y && \ RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://cmake.org/files/v3.13/cmake-3.13.4-Linux-x86_64.sh && \ /bin/sh /var/tmp/cmake-3.13.4-Linux-x86_64.sh --prefix=/usr/local --skip-license && \ rm -rf /var/tmp/cmake-3.13.4-Linux-x86_64.sh -RUN curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash +RUN apt-get update && \ + curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash RUN apt-get update -y && \ DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends software-properties-common && \ apt-add-repository ppa:git-core/ppa -y && \