Skip to content

Commit

Permalink
toolchain: Add Fedora support
Browse files Browse the repository at this point in the history
  • Loading branch information
oschuett committed Mar 4, 2020
1 parent f4680f8 commit 69f1a64
Show file tree
Hide file tree
Showing 3 changed files with 37 additions and 3 deletions.
8 changes: 5 additions & 3 deletions tools/toolchain/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
FROM ubuntu:18.04
ARG BASE_IMAGE=ubuntu:18.04
FROM ${BASE_IMAGE}

ARG MPI_MODE=mpich
ARG LIBINT_LMAX=5
ARG BASE_IMAGE

# author: Ole Schuett

Expand All @@ -10,8 +12,8 @@ ARG LIBINT_LMAX=5
USER root

# install Ubuntu packages.
COPY ./install_requirements.sh .
RUN ./install_requirements.sh
COPY ./install_requirements_${BASE_IMAGE}.sh .
RUN ./install_requirements_${BASE_IMAGE}.sh

# copy helper scripts
WORKDIR /opt/cp2k-toolchain
Expand Down
32 changes: 32 additions & 0 deletions tools/toolchain/install_requirements_fedora:31.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#!/bin/bash -e

# author: Ole Schuett

# Install Fedora packages required for the toolchain.

dnf -y install \
autoconf \
autogen \
automake \
bzip2 \
ca-certificates \
diffutils \
g++ \
git \
less \
libtool \
make \
nano \
pkg-config \
python \
python-numpy \
python3 \
unzip \
vim-common \
wget \
which \
zlib-devel

dnf clean all

#EOF
File renamed without changes.

3 comments on commit 69f1a64

@hfp
Copy link
Member

@hfp hfp commented on 69f1a64 Mar 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit is disruptive due to the non-portable filenames. The CP2K repository cannot be checked out on certain filesystems (if not Windows) due to the : being part of the filenames.

@oschuett
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I'll take care of it.

@oschuett
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be fixed now. I also added a convention check to catch filename issues in the future.

Please sign in to comment.