diff --git a/development/docker/CentOS7Slim.Dockerfile b/development/docker/CentOS7Slim.Dockerfile index a70a413..30e1a41 100644 --- a/development/docker/CentOS7Slim.Dockerfile +++ b/development/docker/CentOS7Slim.Dockerfile @@ -6,35 +6,32 @@ ARG CPPCHECK_VERSION=2.5 # Define a local name FROM neszt/cppcheck-docker:${CPPCHECK_VERSION} AS upstream_cppcheck +#Add label for transparency +LABEL org.opencontainers.image.source https://github.com/mantidproject/dockerfiles + # Base # CentOS 7 matches platform used by conda-forge FROM centos:7 -# Install minimal developer tools +# Install IUS repo for additional yum installs (e.g. git v2 onwards) +# Install EPEL repo as IUS repo has some dependencies on it RUN yum install -y \ https://repo.ius.io/ius-release-el7.rpm && \ - yum -y remove git && \ yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm -RUN yum install -y \ - git236 - # Add target user RUN useradd --uid 911 --user-group --shell /bin/bash --create-home abc -#Add label for transparency -LABEL org.opencontainers.image.source https://github.com/mantidproject/dockerfiles - # Install minimal developer tools RUN yum install -y \ ccache \ curl \ + git236 \ graphviz \ libXScrnSaver \ openssl \ pciutils-libs \ perl-Digest-MD5 \ - python36-pip \ sudo \ which \ xorg-x11-server-Xvfb && \ diff --git a/development/docker/build_common_slim.sh b/development/docker/build_common_slim.sh index 2288e92..4db53d0 100644 --- a/development/docker/build_common_slim.sh +++ b/development/docker/build_common_slim.sh @@ -3,6 +3,6 @@ # Use GitHub packages container registry REGISTRY="ghcr.io" ORG="mantidproject" -VERSION="0.12" +VERSION="0.13" BUILD_LOG_DIR="build_logs" diff --git a/jenkins-node/mantid-builder/docker-images/CentOS7Slim.Dockerfile b/jenkins-node/mantid-builder/docker-images/CentOS7Slim.Dockerfile index ccbed61..593e77f 100644 --- a/jenkins-node/mantid-builder/docker-images/CentOS7Slim.Dockerfile +++ b/jenkins-node/mantid-builder/docker-images/CentOS7Slim.Dockerfile @@ -1,6 +1,6 @@ # Arguments allowed to be used in FROM have to come # before the first stage -ARG DEVELOPMENT_IMAGE_VERSION=0.12 +ARG DEVELOPMENT_IMAGE_VERSION=0.13 FROM ghcr.io/mantidproject/mantid-development-centos7-slim:${DEVELOPMENT_IMAGE_VERSION} #Add label for transparency diff --git a/jenkins-node/mantid-builder/docker-images/build_common_slim.sh b/jenkins-node/mantid-builder/docker-images/build_common_slim.sh index 51b0028..cc7956f 100644 --- a/jenkins-node/mantid-builder/docker-images/build_common_slim.sh +++ b/jenkins-node/mantid-builder/docker-images/build_common_slim.sh @@ -3,4 +3,4 @@ # Use GitHub packages container registry REGISTRY="ghcr.io" ORG="mantidproject" -VERSION="0.12" +VERSION="0.13"