docker: add file
, adjust locale, and use python3 for ubuntu (#13508)
* docker: add missing module to ubuntu images * docker: fix issue with missing locale * docker: one package per line + rm python2 support * docker: ubuntu image also needs 'file' for buildcache creation
This commit is contained in:
parent
0f5724e908
commit
2520806df2
@ -18,15 +18,35 @@ COPY var $SPACK_ROOT/var
|
|||||||
RUN mkdir -p $SPACK_ROOT/opt/spack
|
RUN mkdir -p $SPACK_ROOT/opt/spack
|
||||||
|
|
||||||
RUN apt-get -yqq update \
|
RUN apt-get -yqq update \
|
||||||
&& apt-get -yqq install \
|
&& apt-get -yqq install --no-install-recommends \
|
||||||
build-essential ca-certificates curl g++ \
|
build-essential \
|
||||||
gcc gfortran git gnupg2 \
|
ca-certificates \
|
||||||
iproute2 lmod lua-posix make \
|
curl \
|
||||||
openssh-server python python-pip tcl \
|
file \
|
||||||
|
g++ \
|
||||||
|
gcc \
|
||||||
|
gfortran \
|
||||||
|
git \
|
||||||
|
gnupg2 \
|
||||||
|
iproute2 \
|
||||||
|
lmod \
|
||||||
|
locales \
|
||||||
|
lua-posix \
|
||||||
|
make \
|
||||||
|
openssh-server \
|
||||||
|
python3 \
|
||||||
|
python3-pip \
|
||||||
|
tcl \
|
||||||
unzip \
|
unzip \
|
||||||
&& pip install boto3 \
|
&& locale-gen en_US.UTF-8 \
|
||||||
|
&& pip3 install boto3 \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Add LANG default to en_US.UTF-8
|
||||||
|
ENV LANGUAGE en_US.UTF-8
|
||||||
|
ENV LANG en_US.UTF-8
|
||||||
|
ENV LC_ALL en_US.UTF-8
|
||||||
|
|
||||||
RUN ( echo ". /usr/share/lmod/lmod/init/bash" \
|
RUN ( echo ". /usr/share/lmod/lmod/init/bash" \
|
||||||
&& echo ". \$SPACK_ROOT/share/spack/setup-env.sh" \
|
&& echo ". \$SPACK_ROOT/share/spack/setup-env.sh" \
|
||||||
&& echo "if [ \"\$CURRENTLY_BUILDING_DOCKER_IMAGE\" '!=' '1' ]" \
|
&& echo "if [ \"\$CURRENTLY_BUILDING_DOCKER_IMAGE\" '!=' '1' ]" \
|
||||||
|
@ -18,15 +18,35 @@ COPY var $SPACK_ROOT/var
|
|||||||
RUN mkdir -p $SPACK_ROOT/opt/spack
|
RUN mkdir -p $SPACK_ROOT/opt/spack
|
||||||
|
|
||||||
RUN apt-get -yqq update \
|
RUN apt-get -yqq update \
|
||||||
&& apt-get -yqq install \
|
&& apt-get -yqq install --no-install-recommends \
|
||||||
build-essential ca-certificates curl g++ \
|
build-essential \
|
||||||
gcc gfortran git gnupg2 \
|
ca-certificates \
|
||||||
iproute2 lmod lua-posix make \
|
curl \
|
||||||
openssh-server python python-pip tcl \
|
file \
|
||||||
|
g++ \
|
||||||
|
gcc \
|
||||||
|
gfortran \
|
||||||
|
git \
|
||||||
|
gnupg2 \
|
||||||
|
iproute2 \
|
||||||
|
lmod \
|
||||||
|
locales \
|
||||||
|
lua-posix \
|
||||||
|
make \
|
||||||
|
openssh-server \
|
||||||
|
python3 \
|
||||||
|
python3-pip \
|
||||||
|
tcl \
|
||||||
unzip \
|
unzip \
|
||||||
&& pip install boto3 \
|
&& locale-gen en_US.UTF-8 \
|
||||||
|
&& pip3 install boto3 \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Add LANG default to en_US.UTF-8
|
||||||
|
ENV LANGUAGE en_US.UTF-8
|
||||||
|
ENV LANG en_US.UTF-8
|
||||||
|
ENV LC_ALL en_US.UTF-8
|
||||||
|
|
||||||
RUN ( echo ". /usr/share/lmod/lmod/init/bash" \
|
RUN ( echo ". /usr/share/lmod/lmod/init/bash" \
|
||||||
&& echo ". \$SPACK_ROOT/share/spack/setup-env.sh" \
|
&& echo ". \$SPACK_ROOT/share/spack/setup-env.sh" \
|
||||||
&& echo "if [ \"\$CURRENTLY_BUILDING_DOCKER_IMAGE\" '!=' '1' ]" \
|
&& echo "if [ \"\$CURRENTLY_BUILDING_DOCKER_IMAGE\" '!=' '1' ]" \
|
||||||
|
Loading…
Reference in New Issue
Block a user