Skip to content

Commit

Permalink
Changes made through review
Browse files Browse the repository at this point in the history
- Moved labelling
- removed unneccessary git remove command
- moved git236 install to install layer
- updated comments
- removed python36-pip install
  • Loading branch information
sf1919 authored and martyngigg committed Nov 22, 2022
1 parent 4e0e903 commit 4173746
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 12 deletions.
15 changes: 6 additions & 9 deletions development/docker/CentOS7Slim.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion development/docker/build_common_slim.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
# Use GitHub packages container registry
REGISTRY="ghcr.io"
ORG="mantidproject"
VERSION="0.12"
VERSION="0.13"

0 comments on commit 4173746

Please sign in to comment.