Re-order dockerfiles for ci and tweak rockylinux8 dockerfile for sign…

…ing (#2195) * Re-order dockerfiles for ci and add new dockerfile for signing Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Remove mvn related args in dockerfile Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Add aws version check after installing Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Support longer dockerfiles Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Support longer dockerfiles Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Add jq Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * More improvements Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> * Add more changes Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
opensearch-project · Jun 15, 2022 · ee2d968 · ee2d968
1 parent b19382e
commit ee2d968
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 3 deletions.
diff --git a/docker/ci/build-image-multi-arch.sh b/docker/ci/build-image-multi-arch.sh
@@ -100,5 +100,5 @@ docker buildx ls | grep $BUILDER_NAME
 docker ps | grep $BUILDER_NAME
 
 # Build multi-arch images
-docker buildx build --platform linux/amd64,linux/arm64 -t opensearchstaging/ci-runner:${TAG_NAME} -f $DOCKERFILE --push .
+docker buildx build --platform linux/amd64,linux/arm64 -t "opensearchstaging/ci-runner:${TAG_NAME}" -f "${DOCKERFILE}" --push .
 
diff --git a/...pensearch-dashboards.x64.arm64.dockerfile → ...pensearch-dashboards.x64.arm64.dockerfile b/...pensearch-dashboards.x64.arm64.dockerfile → ...pensearch-dashboards.x64.arm64.dockerfile
diff --git a/...d.centos7.opensearch.x64.arm64.dockerfile → ...d.centos7.opensearch.x64.arm64.dockerfile b/...d.centos7.opensearch.x64.arm64.dockerfile → ...d.centos7.opensearch.x64.arm64.dockerfile
diff --git a/...ckylinux8.opensearch.x64.arm64.dockerfile → ...ckylinux8.opensearch.x64.arm64.dockerfile b/...ckylinux8.opensearch.x64.arm64.dockerfile → ...ckylinux8.opensearch.x64.arm64.dockerfile
@@ -24,7 +24,7 @@ RUN echo "export LC_ALL=en_US.utf-8" >> /etc/profile.d/python3_ascii.sh && \
 # Add normal dependencies
 RUN dnf clean all && \
     dnf update -y && \
-    dnf install -y which curl git gnupg2 tar net-tools procps-ng python3 python3-devel python3-pip zip unzip
+    dnf install -y which curl git gnupg2 tar net-tools procps-ng python3 python3-devel python3-pip zip unzip jq
 
 # Create user group
 RUN groupadd -g 1000 opensearch && \
@@ -69,7 +69,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 && dnf install -y rpm-build createrepo && dnf clean all
+RUN . /etc/profile.d/rvm.sh && rvm install 2.4.0 && rvm --default use 2.4.0 && dnf install -y rpm-build rpm-sign createrepo pinentry && dnf 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-builder.ubuntu2004.x64.dockerfile → .../docker-builder.ubuntu2004.x64.dockerfile b/.../docker-builder.ubuntu2004.x64.dockerfile → .../docker-builder.ubuntu2004.x64.dockerfile
diff --git a/...centos7.systemd-base.x64.arm64.dockerfile → ...centos7.systemd-base.x64.arm64.dockerfile b/...centos7.systemd-base.x64.arm64.dockerfile → ...centos7.systemd-base.x64.arm64.dockerfile
diff --git a/...pensearch-dashboards.x64.arm64.dockerfile → ...pensearch-dashboards.x64.arm64.dockerfile b/...pensearch-dashboards.x64.arm64.dockerfile → ...pensearch-dashboards.x64.arm64.dockerfile
diff --git a/.../build.ubuntu18.opensearch.x64.dockerfile → .../build.ubuntu18.opensearch.x64.dockerfile b/.../build.ubuntu18.opensearch.x64.dockerfile → .../build.ubuntu18.opensearch.x64.dockerfile
diff --git a/...es/data-prepper.ubuntu2004.x64.dockerfile → ...cy/data-prepper.ubuntu2004.x64.dockerfile b/...es/data-prepper.ubuntu2004.x64.dockerfile → ...cy/data-prepper.ubuntu2004.x64.dockerfile