summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Golabek <tomasz.golabek@nokia.com>2019-07-12 12:39:04 +0200
committerTomasz Golabek <tomasz.golabek@nokia.com>2019-07-15 12:46:20 +0200
commit639278ba4ddea0ca7402839bc2e49ac70f2e14ef (patch)
tree2f771a67dd8f62f846fb6ad50c9249f7000a362a
parente94242606199c0d46a532220d8bad4c96788163c (diff)
Maven staging plugin removed
Required by global-jjb Fixed build of kibana image in passing Change-Id: Ibbec033c2a1c772a1cadc8b4e7385210e246bb9c Issue-ID: SDC-2444 Signed-off-by: Tomasz Golabek <tomasz.golabek@nokia.com>
-rw-r--r--base_sdc-kibana/Dockerfile14
-rw-r--r--pom.xml11
2 files changed, 14 insertions, 11 deletions
diff --git a/base_sdc-kibana/Dockerfile b/base_sdc-kibana/Dockerfile
index 7faba33..9146272 100644
--- a/base_sdc-kibana/Dockerfile
+++ b/base_sdc-kibana/Dockerfile
@@ -34,6 +34,8 @@ FROM kibana:4.3.3
# zlib1g
# CVE-2016-9843 CVE-2016-9841 CVE-2016-9842 CVE-2016-9840
+USER root
+
RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list && \
sed -i '/deb http:\/\/deb.debian.org\/debian jessie-backports main/d' /etc/apt/sources.list && \
echo "deb [check-valid-until=no] http://archive.debian.org/debian jessie-backports main" >> /etc/apt/sources.list && \
@@ -43,6 +45,18 @@ RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt
echo "deb http://deb.debian.org/debian buster main" >> /etc/apt/sources.list && \
echo "deb http://deb.debian.org/debian buster-updates main" >> /etc/apt/sources.list && \
echo "deb http://security.debian.org buster/updates main" >> /etc/apt/sources.list && \
+ apt-get clean && \
+ wget -q https://dl-ssl.google.com/linux/linux_signing_key.pub -O- | apt-key add - && \
+ gpg --keyserver keyserver.ubuntu.com --recv-keys AA8E81B4331F7F50 && \
+ gpg --export AA8E81B4331F7F50 | apt-key add - && \
+ gpg --keyserver keyserver.ubuntu.com --recv-keys 04EE7237B7D453EC && \
+ gpg --export 04EE7237B7D453EC | apt-key add - && \
+ gpg --keyserver keyserver.ubuntu.com --recv-keys 112695A0E562B32A && \
+ gpg --export 112695A0E562B32A | apt-key add - && \
+ gpg --keyserver keyserver.ubuntu.com --recv-keys 648ACFD622F3D138 && \
+ gpg --export 648ACFD622F3D138 | apt-key add - && \
+ gpg --keyserver keyserver.ubuntu.com --recv-keys EF0F382A1A7B6500 && \
+ gpg --export EF0F382A1A7B6500 | apt-key add - && \
apt-get -o Acquire::Check-Valid-Until=false update && \
apt-get -y --no-install-recommends install \
vim \
diff --git a/pom.xml b/pom.xml
index 909ecd3..3784652 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,17 +29,6 @@
<build>
<plugins>
<plugin>
- <groupId>org.sonatype.plugins</groupId>
- <artifactId>nexus-staging-maven-plugin</artifactId>
- <version>1.6.7</version>
- <extensions>true</extensions>
- <configuration>
- <nexusUrl>https://nexus.onap.org</nexusUrl>
- <stagingProfileId>176c31dfe190a</stagingProfileId>
- <serverId>ecomp-staging</serverId>
- </configuration>
- </plugin>
- <plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
<version>0.25.2</version>