summaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorChristian Goll <cgoll@suse.de>2021-12-16 10:47:15 +0100
committerGitHub <noreply@github.com>2021-12-16 09:47:15 +0000
commitbd0ffa8a3c969c219989e44d41bbd99df476282c (patch)
tree7fa92ad2ac30dc790933a91c52043a7dc59aa3cc /share
parentac49ce8b3ba0e1ef64d8a9a63cef0e2dad60b0de (diff)
downloadspack-bd0ffa8a3c969c219989e44d41bbd99df476282c.tar.gz
spack-bd0ffa8a3c969c219989e44d41bbd99df476282c.tar.bz2
spack-bd0ffa8a3c969c219989e44d41bbd99df476282c.tar.xz
spack-bd0ffa8a3c969c219989e44d41bbd99df476282c.zip
Added opensuse/leap:15 to spack containerize (#27837)
Co-authored-by: Massimiliano Culpo <massimiliano.culpo@gmail.com>
Diffstat (limited to 'share')
-rw-r--r--share/spack/docker/leap-15.dockerfile21
-rw-r--r--share/spack/templates/container/leap-15.dockerfile21
2 files changed, 37 insertions, 5 deletions
diff --git a/share/spack/docker/leap-15.dockerfile b/share/spack/docker/leap-15.dockerfile
index 65375c359b..1bf41c6149 100644
--- a/share/spack/docker/leap-15.dockerfile
+++ b/share/spack/docker/leap-15.dockerfile
@@ -2,7 +2,7 @@ FROM opensuse/leap:15.3
MAINTAINER Christian Goll <cgoll@suse.com>
ENV DOCKERFILE_BASE=opensuse \
- DOCKERFILE_DISTRO=opensuse_leap \
+ DOCKERFILE_DISTRO=leap \
DOCKERFILE_DISTRO_VERSION=15.3 \
SPACK_ROOT=/opt/spack \
DEBIAN_FRONTEND=noninteractive \
@@ -11,10 +11,21 @@ ENV DOCKERFILE_BASE=opensuse \
RUN zypper ref && \
zypper up -y && \
- zypper in -y python3-base python3-boto3 \
- xz gzip tar bzip2 curl patch patchelf file \
- gcc-c++ gcc-fortran make cmake automake && \
- zypper clean
+ zypper in -y \
+ bzip2\
+ curl\
+ file\
+ gcc-c++\
+ gcc-fortran\
+ make\
+ gzip\
+ patch\
+ patchelf\
+ python3-base \
+ python3-boto3\
+ tar\
+ xz\
+&& zypper clean
# clean up manpages
RUN rm -rf /var/cache/zypp/* \
diff --git a/share/spack/templates/container/leap-15.dockerfile b/share/spack/templates/container/leap-15.dockerfile
new file mode 100644
index 0000000000..38e4f1c009
--- /dev/null
+++ b/share/spack/templates/container/leap-15.dockerfile
@@ -0,0 +1,21 @@
+{% extends "container/bootstrap-base.dockerfile" %}
+{% block install_os_packages %}
+RUN zypper ref && \
+ zypper up -y && \
+ zypper in -y \
+ bzip2\
+ curl\
+ file\
+ gcc-c++\
+ gcc-fortran\
+ make\
+ git\
+ gzip\
+ patch\
+ patchelf\
+ python3-base \
+ python3-boto3\
+ tar\
+ xz\
+&& zypper clean
+{% endblock %}