From 363933ac57ab97e2fc5cb372056b6e8463602b0b Mon Sep 17 00:00:00 2001 From: Donald Hunter Date: Wed, 27 Feb 2019 15:10:54 +0000 Subject: Apply fix to PNDA release/5.0 for knox Change-Id: I284c7e58dc5a0de569731b9bffac13506689695a Signed-off-by: Donald Hunter Issue-ID: DCAEGEN2-1298 --- pnda-mirror-container/Dockerfile | 4 ++++ pnda-mirror-container/pnda-5.0-maint.patch | 13 +++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 pnda-mirror-container/pnda-5.0-maint.patch diff --git a/pnda-mirror-container/Dockerfile b/pnda-mirror-container/Dockerfile index 9891a15..ea7e100 100644 --- a/pnda-mirror-container/Dockerfile +++ b/pnda-mirror-container/Dockerfile @@ -26,6 +26,10 @@ RUN yum clean all && rm -rf /var/cache/yum/* && yum install gettext git -y RUN git clone -b $PNDARELEASE https://github.com/pndaproject/pnda.git +COPY pnda-5.0-maint.patch / +WORKDIR /pnda +RUN git apply /pnda-5.0-maint.patch + WORKDIR /pnda/mirror # Add the -r flag to mirror rpm packages RUN ./create_mirror.sh -d $HADOOPDIST -r diff --git a/pnda-mirror-container/pnda-5.0-maint.patch b/pnda-mirror-container/pnda-5.0-maint.patch new file mode 100644 index 0000000..8dc4af1 --- /dev/null +++ b/pnda-mirror-container/pnda-5.0-maint.patch @@ -0,0 +1,13 @@ +diff --git a/mirror/dependencies/pnda-static-file-dependencies.txt b/mirror/dependencies/pnda-static-file-dependencies.txt +index 8f04a87..133e08b 100644 +--- a/mirror/dependencies/pnda-static-file-dependencies.txt ++++ b/mirror/dependencies/pnda-static-file-dependencies.txt +@@ -21,5 +21,5 @@ http://central.maven.org/maven2/org/kitesdk/kite-tools/1.0.0/kite-tools-1.0.0-bi + http://central.maven.org/maven2/org/kitesdk/kite-tools/1.0.0/kite-tools-1.0.0-binary.jar.sha1 + https://releases.hashicorp.com/consul/1.0.3/consul_1.0.3_linux_amd64.zip + https://releases.hashicorp.com/consul/1.0.3/consul_1.0.3_SHA256SUMS +-http://www.apache.org/dist/knox/1.1.0/knox-1.1.0.zip +-http://www.apache.org/dist/knox/1.1.0/knox-1.1.0.zip.sha1 ++http://archive.apache.org/dist/knox/1.1.0/knox-1.1.0.zip ++http://archive.apache.org/dist/knox/1.1.0/knox-1.1.0.zip.sha1 + -- cgit 1.2.3-korg