From e279aff4797bf09602d2d1e80c959a4cacd8c49a Mon Sep 17 00:00:00 2001 From: Sebastiaan Huber Date: Wed, 19 Aug 2020 11:42:50 +0200 Subject: [PATCH 1/2] Update the base image to `phusion/baseimage:bionic-1.0.0` (#19) Migrate to the latest stable Bionic Beaver (18.04) Ubuntu distribution. The old version `phusion/baseimage:0.11` is over two years old and at the point of writing contains 4 critical security vulnerabilities. We cannot yet migrate straight to Focal Fossa (20.04) since only an alpha version release is available for now. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index eb98aaa..45784a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # See https://github.com/phusion/baseimage-docker/blob/master/Changelog.md # Based on Ubuntu 18.04 since v0.11 -FROM phusion/baseimage:0.11 +FROM phusion/baseimage:bionic-1.0.0 MAINTAINER AiiDA Team # Use the following arguments during *build* time: From bb65e0d46bc66cbaa73f05bf0f2d71240e48bc88 Mon Sep 17 00:00:00 2001 From: Aliaksandr Yakutovich Date: Wed, 2 Sep 2020 15:34:59 +0200 Subject: [PATCH 2/2] Install ruaml.yaml via conda. (#21) There are two different packages available on conda: `ruamel.yaml` and `ruamel_yaml`. Pip cannot distinguish them, therefore we have to install `ruamel.yaml` via conda. --- Dockerfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 45784a2..4a70cab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -80,8 +80,11 @@ RUN cd /tmp && \ conda update --all --quiet --yes && \ conda clean --all -f -y +# Upgrade ruamel.py version. Fixes https://github.com/aiidateam/aiida-core/issues/4339. +RUN conda install ruamel.yaml==0.16.10 + # This is needed to let non-root users create conda environments. -RUN mkdir /opt/conda/pkgs && touch /opt/conda/pkgs/urls.txt +RUN touch /opt/conda/pkgs/urls.txt # Create system user. COPY my_init.d/create-system-user.sh /etc/my_init.d/10_create-system-user.sh