Skip to content

Commit ee2d968

Browse files
Re-order dockerfiles for ci and tweak rockylinux8 dockerfile for signing (#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>
1 parent b19382e commit ee2d968

9 files changed

+3
-3
lines changed

docker/ci/build-image-multi-arch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,5 +100,5 @@ docker buildx ls | grep $BUILDER_NAME
100100
docker ps | grep $BUILDER_NAME
101101

102102
# Build multi-arch images
103-
docker buildx build --platform linux/amd64,linux/arm64 -t opensearchstaging/ci-runner:${TAG_NAME} -f $DOCKERFILE --push .
103+
docker buildx build --platform linux/amd64,linux/arm64 -t "opensearchstaging/ci-runner:${TAG_NAME}" -f "${DOCKERFILE}" --push .
104104

docker/ci/dockerfiles/build.centos7.opensearch-dashboards.x64.arm64.dockerfile renamed to docker/ci/dockerfiles/current/build.centos7.opensearch-dashboards.x64.arm64.dockerfile

File renamed without changes.

docker/ci/dockerfiles/build.centos7.opensearch.x64.arm64.dockerfile renamed to docker/ci/dockerfiles/current/build.centos7.opensearch.x64.arm64.dockerfile

File renamed without changes.

docker/ci/dockerfiles/build.rockylinux8.opensearch.x64.arm64.dockerfile renamed to docker/ci/dockerfiles/current/build.rockylinux8.opensearch.x64.arm64.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ RUN echo "export LC_ALL=en_US.utf-8" >> /etc/profile.d/python3_ascii.sh && \
2424
# Add normal dependencies
2525
RUN dnf clean all && \
2626
dnf update -y && \
27-
dnf install -y which curl git gnupg2 tar net-tools procps-ng python3 python3-devel python3-pip zip unzip
27+
dnf install -y which curl git gnupg2 tar net-tools procps-ng python3 python3-devel python3-pip zip unzip jq
2828

2929
# Create user group
3030
RUN groupadd -g 1000 opensearch && \
@@ -69,7 +69,7 @@ SHELL ["/bin/bash", "-lc"]
6969
CMD ["/bin/bash", "-l"]
7070

7171
# Install ruby / rpm / fpm related dependencies
72-
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
72+
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
7373

7474
ENV RUBY_HOME=/usr/local/rvm/rubies/ruby-2.4.0/bin
7575
ENV RVM_HOME=/usr/local/rvm/bin

docker/ci/dockerfiles/docker-builder.ubuntu2004.x64.dockerfile renamed to docker/ci/dockerfiles/current/docker-builder.ubuntu2004.x64.dockerfile

File renamed without changes.

docker/ci/dockerfiles/test.centos7.systemd-base.x64.arm64.dockerfile renamed to docker/ci/dockerfiles/current/test.centos7.systemd-base.x64.arm64.dockerfile

File renamed without changes.

docker/ci/dockerfiles/test.rockylinux8.opensearch-dashboards.x64.arm64.dockerfile renamed to docker/ci/dockerfiles/current/test.rockylinux8.opensearch-dashboards.x64.arm64.dockerfile

File renamed without changes.

docker/ci/dockerfiles/build.ubuntu18.opensearch.x64.dockerfile renamed to docker/ci/dockerfiles/legacy/build.ubuntu18.opensearch.x64.dockerfile

File renamed without changes.

docker/ci/dockerfiles/data-prepper.ubuntu2004.x64.dockerfile renamed to docker/ci/dockerfiles/legacy/data-prepper.ubuntu2004.x64.dockerfile

File renamed without changes.

0 commit comments

Comments
 (0)