Skip to content

Commit

Permalink
Merge pull request #47 from KaiSzuttor/plain_container
Browse files Browse the repository at this point in the history
Added container without external dependencies.
  • Loading branch information
KaiSzuttor authored Dec 10, 2018
2 parents 5c27680 + 46d326e commit 155ef38
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ ubuntu:summerschool:
<<: *build_definition
ubuntu:18.04:
<<: *build_definition
ubuntu:wo-dependencies:
<<: *build_definition
clang:6.0:
<<: *build_definition
cuda:8.0:
Expand Down
6 changes: 1 addition & 5 deletions docker/rocm/Dockerfile-latest
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,11 @@ RUN apt-get update && apt-get install -y \
curl \
pkg-config \
openmpi-bin libopenmpi-dev \
lcov \
libfftw3-dev \
libboost-dev libboost-serialization-dev libboost-mpi-dev libboost-filesystem-dev libboost-test-dev \
libgsl-dev \
cython python python-numpy python-h5py python-enum \
lcov \
curl \
git \
pep8 pylint \
python-vtk \
Expand All @@ -24,7 +22,6 @@ RUN apt-get update && apt-get install -y \
libhdf5-10:amd64 \
vim \
ccache \
rocfft \
rocrand \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
Expand All @@ -34,8 +31,7 @@ RUN cd /tmp \
&& cp -r Thrust-6e31840ed4ac5e158e485c5cc22558a601a86ae8/thrust /opt/rocm/include/ \
&& rm -r Thrust-6e31840ed4ac5e158e485c5cc22558a601a86ae8

RUN apt-get remove -y rocfft \
&& cd /tmp \
RUN cd /tmp \
&& git clone -b r2c https://github.com/mkuron/rocFFT.git \
&& cd rocFFT \
&& mkdir build && cd build \
Expand Down
23 changes: 23 additions & 0 deletions docker/ubuntu/Dockerfile-wo-dependencies
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
FROM ubuntu:bionic
MAINTAINER Florian Weik <[email protected]>
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install -y \
apt-utils \
cmake \
build-essential \
openmpi-bin libopenmpi-dev \
libboost-dev libboost-serialization-dev libboost-mpi-dev libboost-filesystem-dev libboost-test-dev \
cython python python-numpy python-h5py python-enum34 \
curl \
git \
pycodestyle pylint \
python-vtk6 \
python-pyface \
vim \
ccache \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

RUN useradd -m espresso
USER espresso
WORKDIR /home/espresso

0 comments on commit 155ef38

Please sign in to comment.