From 787bf462d74d989d68cfc1c0c86cd4c46335481b Mon Sep 17 00:00:00 2001 From: Pedro Crespo <32402063+pcrespov@users.noreply.github.com> Date: Wed, 12 Oct 2022 13:35:14 +0200 Subject: [PATCH 1/3] sync with master head --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index dcaa956..952c04f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,10 +5,10 @@ LABEL org.opencontainers.image.authors="neagu@itis.swiss" LABEL org.opencontainers.image.source="https://github.com/ITISFoundation/ci-service-integration-library" LABEL org.opencontainers.image.licenses="MIT" -ARG REPO_NAME="https://github.com/GitHK/osparc-simcore-forked.git" -ARG BRANCH_NAME="service-integration-library-additions" -ARG COMMIT_SHA="4973ac6123511ecb06ff039eae5e6dfc81d45179" -ARG CLONE_DIR="/opsarc" +ARG REPO_NAME="https://github.com/ITISFoundation/osparc-simcore.git" +ARG BRANCH_NAME="master" +ARG COMMIT_SHA="2e85e0106f61271c22ac57ceee538afe00632074" +ARG CLONE_DIR="/osparc" ARG PYTHON_VERSION="3.9.12" ARG DEBIAN_FRONTEND=noninteractive ARG DOCKER_COMPOSE_VERSION="1.29.2" From 0e686a1475a1c29678f782f0e87af9aca1c4266c Mon Sep 17 00:00:00 2001 From: Pedro Crespo <32402063+pcrespov@users.noreply.github.com> Date: Wed, 12 Oct 2022 13:37:51 +0200 Subject: [PATCH 2/3] minor --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 952c04f..b396cf0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,10 +17,10 @@ ARG INSTALL_DIR="/package-install-dir" # Fixes issues with nvidia keys suddenly gone missing # TODO: check if can be removed RUN apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu1804/x86_64/3bf863cc.pub 18 -RUN apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64/7fa2af80.pub +RUN apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/machine-learning/repos/ubuntu1804/x86_64/7fa2af80.pub #Set of all dependencies needed for pyenv to work on Ubuntu -RUN apt-get update && \ +RUN apt-get update && \ apt-get install -y --no-install-recommends \ make \ build-essential \ From 29b7ee40a313d869b4ddcd3e32994c807f8eba05 Mon Sep 17 00:00:00 2001 From: Pedro Crespo <32402063+pcrespov@users.noreply.github.com> Date: Thu, 13 Oct 2022 14:54:10 +0200 Subject: [PATCH 3/3] sync with last ooil:1.0.2 on https://github.com/ITISFoundation/osparc-simcore/pull/3433 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b396cf0..f51eafd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ LABEL org.opencontainers.image.licenses="MIT" ARG REPO_NAME="https://github.com/ITISFoundation/osparc-simcore.git" ARG BRANCH_NAME="master" -ARG COMMIT_SHA="2e85e0106f61271c22ac57ceee538afe00632074" +ARG COMMIT_SHA="2169876871339b125a6badc14c9c26d4cfccb26d" ARG CLONE_DIR="/osparc" ARG PYTHON_VERSION="3.9.12" ARG DEBIAN_FRONTEND=noninteractive