From 695eda333f8783aca81704d5f7669b6f458aa9aa Mon Sep 17 00:00:00 2001 From: Ivan Bella Date: Mon, 1 Jul 2024 12:35:14 +0000 Subject: [PATCH 1/3] updated metadata-util submodule --- core/utils/metadata-utils | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/utils/metadata-utils b/core/utils/metadata-utils index ebca7ceddb2..50670a0ae32 160000 --- a/core/utils/metadata-utils +++ b/core/utils/metadata-utils @@ -1 +1 @@ -Subproject commit ebca7ceddb2de9e5f6ff86ec02db308f0036d897 +Subproject commit 50670a0ae3298021912c84e8796bc2d9b095c99f From 91050f884c33e6e09ad23a047e59e0f3a24b741e Mon Sep 17 00:00:00 2001 From: Whitney O'Meara Date: Mon, 1 Jul 2024 14:12:19 +0000 Subject: [PATCH 2/3] updated query metric service submodules --- microservices/services/query-metric | 2 +- microservices/starters/query-metric | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/microservices/services/query-metric b/microservices/services/query-metric index 18a35f833c5..ffbd425bf9d 160000 --- a/microservices/services/query-metric +++ b/microservices/services/query-metric @@ -1 +1 @@ -Subproject commit 18a35f833c5346d020202f3baa8d6237951853db +Subproject commit ffbd425bf9dbbf4ba4bc775a9c5de62b483d5342 diff --git a/microservices/starters/query-metric b/microservices/starters/query-metric index cac7e346233..03505d85a0b 160000 --- a/microservices/starters/query-metric +++ b/microservices/starters/query-metric @@ -1 +1 @@ -Subproject commit cac7e346233493d8fd3b767f48e2456008d343b9 +Subproject commit 03505d85a0bd497d35864f9f008c0738bc7e909f From d41e8861aecab19d5010292cbaa2a3916bc09475 Mon Sep 17 00:00:00 2001 From: Whitney O'Meara Date: Mon, 1 Jul 2024 14:12:35 +0000 Subject: [PATCH 3/3] Updated centos dockerfiles to use yum repo mirror --- contrib/datawave-quickstart/docker/Dockerfile | 3 +++ web-services/deploy/application/src/main/docker/Dockerfile | 2 ++ 2 files changed, 5 insertions(+) diff --git a/contrib/datawave-quickstart/docker/Dockerfile b/contrib/datawave-quickstart/docker/Dockerfile index 15bfe844470..dc1b851618d 100644 --- a/contrib/datawave-quickstart/docker/Dockerfile +++ b/contrib/datawave-quickstart/docker/Dockerfile @@ -26,6 +26,9 @@ ENV DW_ACCUMULO_BIND_HOST=localhost COPY . /opt/datawave +# Configure the yum repo mirror +RUN sed -i 's|mirrorlist|#mirrorlist|g;s|#baseurl.*|baseurl=http://archive.kernel.org/centos-vault/centos/$releasever/updates/$basearch/|g' /etc/yum.repos.d/CentOS-Base.repo + # Install dependencies, configure password-less/zero-prompt SSH... RUN yum -y install gcc-c++ openssl openssh openssh-server openssh-clients openssl-libs which bc wget git java-11-openjdk-devel iproute && \ diff --git a/web-services/deploy/application/src/main/docker/Dockerfile b/web-services/deploy/application/src/main/docker/Dockerfile index 750db9d81c8..4e2605ef879 100644 --- a/web-services/deploy/application/src/main/docker/Dockerfile +++ b/web-services/deploy/application/src/main/docker/Dockerfile @@ -1,5 +1,7 @@ FROM azul/zulu-openjdk-centos:11.0.18-11.62.17 +# Configure the yum repo mirror +RUN sed -i 's|mirrorlist|#mirrorlist|g;s|#baseurl.*|baseurl=http://archive.kernel.org/centos-vault/centos/$releasever/updates/$basearch/|g' /etc/yum.repos.d/CentOS-Base.repo RUN yum -y install deltarpm centos-release-sc && \ chmod -R 777 /usr/lib/jvm/zulu11/bin/* && \