From 143b8a7370cd6f4a7769981bcc7db1292acc658c Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Wed, 12 Sep 2018 10:32:53 +0200 Subject: [PATCH] script/kubejacker: Add openSUSE based images * Added executable bit of `kubejacker.sh`. * Reduced the number of `RUN` commands * Added zypper commands for SUSE. Signed-off-by: Sebastian Wagner --- src/script/kubejacker/Dockerfile | 25 +++++++++++++++++-------- src/script/kubejacker/kubejacker.sh | 0 2 files changed, 17 insertions(+), 8 deletions(-) mode change 100644 => 100755 src/script/kubejacker/kubejacker.sh diff --git a/src/script/kubejacker/Dockerfile b/src/script/kubejacker/Dockerfile index 9a3971c1ef8ea..ed2113a832546 100644 --- a/src/script/kubejacker/Dockerfile +++ b/src/script/kubejacker/Dockerfile @@ -1,4 +1,3 @@ - from BASEIMAGE # Some apt-get commands fail in docker builds because they try @@ -7,14 +6,25 @@ ENV TERM linux # Baseline rook images may be from before the `rook` ceph-mgr module, # so let's install the dependencies of that -RUN yum install -y python-pip -RUN pip install kubernetes==6.0.0 +# New RGW dependency since luminous: liboath +# For the dashboard, if the rook images are pre-Mimic: ython-bcrypt librdmacm + +RUN (grep -q rhel /etc/os-release && ( \ + yum install -y python-pip && \ + yum install -y liboath && \ + yum install -y python-bcrypt librdmacm \ + )) || (grep -q suse /etc/os-release && ( \ + zypper --non-interactive --gpg-auto-import-keys install --no-recommends --auto-agree-with-licenses --replacefiles --details \ + python-pip \ + liboauth-devel \ + python-bcrypt \ + lz4 \ + librdmacm1 \ + libopenssl1_1 \ + )) -# New RGW dependency since luminous -RUN yum install -y liboath -# For the dashboard, if the rook images are pre-Mimic -RUN yum install -y python-bcrypt librdmacm +RUN pip install kubernetes==6.0.0 ADD bin.tar.gz /usr/bin/ ADD lib.tar.gz /usr/lib64/ @@ -23,4 +33,3 @@ ADD lib.tar.gz /usr/lib64/ # build binaries will be looking for libs there. ADD eclib.tar.gz /usr/local/lib64/ceph/erasure-code/ ADD mgr_plugins.tar.gz /usr/local/lib64/ceph/mgr - diff --git a/src/script/kubejacker/kubejacker.sh b/src/script/kubejacker/kubejacker.sh old mode 100644 new mode 100755 -- 2.39.5