install createrepo in docker image for RPM yum repo support (#1955)

* install createrepo in docker image for RPM yum repo support Signed-off-by: Tianle Huang <tianleh@amazon.com> * fix Signed-off-by: Tianle Huang <tianleh@amazon.com> * update opensearch to use new image Signed-off-by: Tianle Huang <tianleh@amazon.com>
opensearch-project · Apr 12, 2022 · 8522a31 · 8522a31
1 parent ab77965
commit 8522a31
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/docker/ci/dockerfiles/build.centos7.opensearch-dashboards.x64.arm64.dockerfile b/docker/ci/dockerfiles/build.centos7.opensearch-dashboards.x64.arm64.dockerfile
@@ -105,7 +105,7 @@ SHELL ["/bin/bash", "-lc"]
 CMD ["/bin/bash", "-l"]
 
 # Install ruby / rpm / fpm related dependencies
-RUN . /etc/profile.d/rvm.sh && rvm install 2.4.0 && rvm --default use 2.4.0 && yum install -y rpm-build && yum clean all
+RUN . /etc/profile.d/rvm.sh && rvm install 2.4.0 && rvm --default use 2.4.0 && yum install -y rpm-build createrepo && yum clean all
 
 ENV RUBY_HOME=/usr/local/rvm/rubies/ruby-2.4.0/bin
 ENV RVM_HOME=/usr/local/rvm/bin

diff --git a/docker/ci/dockerfiles/build.centos7.opensearch.x64.arm64.dockerfile b/docker/ci/dockerfiles/build.centos7.opensearch.x64.arm64.dockerfile
@@ -114,7 +114,7 @@ CMD ["/bin/bash", "-l"]
 
 # Install ruby / rpm / fpm related dependencies
 RUN . /etc/profile.d/rvm.sh && rvm install 2.4.0 && rvm --default use 2.4.0 && \
-    yum install -y rpm-build && \
+    yum install -y rpm-build createrepo && yum clean all && \
     gem install fpm -v 1.13.0
 
 ENV RUBY_HOME=/usr/local/rvm/rubies/ruby-2.4.0/bin

diff --git a/manifests/2.0.0/opensearch-2.0.0.yml b/manifests/2.0.0/opensearch-2.0.0.yml
@@ -2,7 +2,7 @@
 schema-version: '1.0'
 ci:
   image:
-    name: opensearchstaging/ci-runner:ci-runner-centos7-v1
+    name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v1
     args: -e JAVA_HOME=/opt/java/openjdk-17
 build:
   name: OpenSearch

diff --git a/manifests/2.1.0/opensearch-2.1.0.yml b/manifests/2.1.0/opensearch-2.1.0.yml
@@ -5,7 +5,7 @@ build:
   version: 2.1.0
 ci:
   image:
-    name: opensearchstaging/ci-runner:centos7-x64-arm64-jdkmulti-node10.24.1-cypress6.9.1-20211028
+    name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v1
 components:
   - name: OpenSearch
     repository: https://github.com/opensearch-project/OpenSearch.git

diff --git a/manifests/3.0.0/opensearch-3.0.0.yml b/manifests/3.0.0/opensearch-3.0.0.yml
@@ -5,7 +5,7 @@ build:
   version: 3.0.0
 ci:
   image:
-    name: opensearchstaging/ci-runner:ci-runner-centos7-v1
+    name: opensearchstaging/ci-runner:ci-runner-centos7-opensearch-build-v1
 components:
   - name: OpenSearch
     repository: https://github.com/opensearch-project/OpenSearch.git