diff options
| author | John Spray <jspray@redhat.com> | 2018-09-12 12:25:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-12 12:25:44 +0200 |
| commit | f9d57a0b55c436d871a0e7667dd573a596c81af3 (patch) | |
| tree | cd72e488da0857fec7b017c9d9972251f875bfb9 /src/script | |
| parent | Merge pull request #23941 from trociny/wip-23445 (diff) | |
| parent | script/kubejacker: Add openSUSE based images (diff) | |
| download | ceph-f9d57a0b55c436d871a0e7667dd573a596c81af3.tar.xz ceph-f9d57a0b55c436d871a0e7667dd573a596c81af3.zip | |
Merge pull request #24055 from sebastian-philipp/kubejacker-opensuse-mimic
script/kubejacker: Add openSUSE based images
Reviewed-by: John Spray <john.spray@redhat.com>
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/kubejacker/Dockerfile | 25 | ||||
| -rwxr-xr-x[-rw-r--r--] | src/script/kubejacker/kubejacker.sh | 0 |
2 files changed, 17 insertions, 8 deletions
diff --git a/src/script/kubejacker/Dockerfile b/src/script/kubejacker/Dockerfile index 9a3971c1ef8..ed2113a8325 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 index 13b1ffa5cf4..13b1ffa5cf4 100644..100755 --- a/src/script/kubejacker/kubejacker.sh +++ b/src/script/kubejacker/kubejacker.sh |