Skip to content

Commit

Permalink
Toolchain: Remove colon from filenames
Browse files Browse the repository at this point in the history
  • Loading branch information
oschuett committed Mar 6, 2020
1 parent 1e5064a commit 3390b8d
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 5 deletions.
6 changes: 3 additions & 3 deletions tools/toolchain/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ ARG BASE_IMAGE

USER root

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

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

# author: Ole Schuett

if (( $# != 1 )) ; then
echo "Usage: install_requirements.sh <BASE_IMAGE>"
exit 1
fi

BASE_IMAGE=$1

if [[ ${BASE_IMAGE} == ubuntu* ]] ; then
./install_requirements_ubuntu.sh

elif [[ ${BASE_IMAGE} == fedora* ]] ; then
./install_requirements_fedora.sh

else
echo "Unknown base image: ${BASE_IMAGE}"
exit 1
fi

#EOF
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@

# Install Fedora packages required for the toolchain.

dnf -y install \
echo "Installing Fedora packages..."

dnf -qy install \
autoconf \
autogen \
automake \
Expand All @@ -27,6 +29,6 @@ dnf -y install \
which \
zlib-devel

dnf clean all
dnf clean -q all

#EOF
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

# Install Ubuntu packages required for the toolchain.

echo "Installing Ubuntu packages..."

apt-get update -qq

apt-get install -qq --no-install-recommends \
Expand Down

0 comments on commit 3390b8d

Please sign in to comment.