From: Zhe Huang Date: Mon, 8 Jul 2019 18:35:22 +0000 (-0400) Subject: Add nexus-helm submodule for nexus ci job to generate nexus image. X-Git-Tag: 0.0.2~71 X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=ca722e6a52445d9148ee361d0cc6eaba1bbb7610;p=it%2Fdep.git Add nexus-helm submodule for nexus ci job to generate nexus image. Signed-off-by: Zhe Huang Change-Id: I3f30df2826ac807c7a7019bdddb0dd6eb8f6732e --- diff --git a/.gitmodules b/.gitmodules index 43126d91..77b95efa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "infra/10-Nexus/docker/nexus-repository-helm"] - path = infra/10-Nexus/docker/nexus-repository-helm +[submodule "ric-infra/10-Nexus/docker/nexus-repository-helm"] + path = ric-infra/10-Nexus/docker/nexus-repository-helm url = https://github.com/sonatype-nexus-community/nexus-repository-helm.git diff --git a/ric-infra/10-Nexus/docker/Dockerfile b/ric-infra/10-Nexus/docker/Dockerfile deleted file mode 100644 index bb9a60e4..00000000 --- a/ric-infra/10-Nexus/docker/Dockerfile +++ /dev/null @@ -1,62 +0,0 @@ -################################################################################ -# Copyright (c) 2019 AT&T Intellectual Property. # -# Copyright (c) 2019 Nokia. # -# # -# Licensed under the Apache License, Version 2.0 (the "License"); # -# you may not use this file except in compliance with the License. # -# You may obtain a copy of the License at # -# # -# http://www.apache.org/licenses/LICENSE-2.0 # -# # -# Unless required by applicable law or agreed to in writing, software # -# distributed under the License is distributed on an "AS IS" BASIS, # -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # -# See the License for the specific language governing permissions and # -# limitations under the License. # -################################################################################ - -ARG NEXUS_VERSION=3.15.2 -ARG NEXUS_BUILD=01 - -FROM maven:3-jdk-8-alpine AS aptbuild -#ARG NEXUS_VERSION=3.14.0 -#ARG NEXUS_BUILD=04 - -COPY ./nexus-repository-apt /nexus-repository-apt/ -#RUN cd /nexus-repository-apt/; sed -i "s/3.15.2-01/${NEXUS_VERSION}-${NEXUS_BUILD}/g" pom.xml; \ -# mvn; -RUN cd /nexus-repository-apt/; mvn; - - -FROM maven:3-jdk-8-alpine AS helmbuild -ARG NEXUS_VERSION=3.15.2 -ARG NEXUS_BUILD=01 - -COPY ./nexus-repository-helm /nexus-repository-helm/ -RUN cd /nexus-repository-helm/; sed -i "s/3.14.0-04/${NEXUS_VERSION}-${NEXUS_BUILD}/g" pom.xml; \ - mvn clean package; - - - - -FROM sonatype/nexus3:$NEXUS_VERSION -ARG NEXUS_VERSION=3.15.2 -ARG NEXUS_BUILD=01 -# Will not seem to work in sed without some magick -ARG APT_VERSION=1.0.10 -ARG COMP_VERSION=1.18 -#ARG COMP_VERSION=1.16.1 -ARG XZ_VERSION=1.8 -ARG APT_TARGET=/opt/sonatype/nexus/system/net/staticsnow/nexus-repository-apt/${APT_VERSION}/ -ARG HELM_VERSION=0.0.7 -ARG TARGET_DIR=/opt/sonatype/nexus/system/org/sonatype/nexus/plugins/nexus-repository-helm/${HELM_VERSION}/ -USER root -RUN mkdir -p ${APT_TARGET}; \ - sed -i "s@nexus-repository-maven@nexus-repository-maven\n nexus-repository-apt@g" /opt/sonatype/nexus/system/org/sonatype/nexus/assemblies/nexus-core-feature/${NEXUS_VERSION}-${NEXUS_BUILD}/nexus-core-feature-${NEXUS_VERSION}-${NEXUS_BUILD}-features.xml; \ - sed -i "s@\n
net.staticsnow:nexus-repository-apt
\n mvn:net.staticsnow/nexus-repository-apt/${APT_VERSION}\n mvn:org.apache.commons/commons-compress/${COMP_VERSION}\n mvn:org.tukaani/xz/${XZ_VERSION}\n \n @nexus-repository-maven\n nexus-repository-helm@g' /opt/sonatype/nexus/system/org/sonatype/nexus/assemblies/nexus-core-feature/${NEXUS_VERSION}-${NEXUS_BUILD}/nexus-core-feature-${NEXUS_VERSION}-${NEXUS_BUILD}-features.xml; \ - sed -i 's@\n
org.sonatype.nexus.plugins:nexus-repository-helm
\n mvn:org.sonatype.nexus.plugins/nexus-repository-helm/0.0.7\n mvn:org.apache.commons/commons-compress/1.18\n \n