From 4dc3d0aaae1f11499357839dac9e92f13ce0e934 Mon Sep 17 00:00:00 2001 From: Denes Nemeth Date: Wed, 2 May 2018 12:24:54 +0200 Subject: Fix image propagation to nexus Change-Id: Ib3e5a7336ec7c9c70d6b7fde25b3aea42344e76f Signed-off-by: Denes Nemeth Issue-ID: VFC-728 --- nokiav2/deployment/Dockerfile | 20 +++++ nokiav2/deployment/src/main/resources/Dockerfile | 18 ----- .../deployment/src/main/resources/build_image.sh | 87 ---------------------- 3 files changed, 20 insertions(+), 105 deletions(-) create mode 100755 nokiav2/deployment/Dockerfile delete mode 100755 nokiav2/deployment/src/main/resources/Dockerfile delete mode 100755 nokiav2/deployment/src/main/resources/build_image.sh diff --git a/nokiav2/deployment/Dockerfile b/nokiav2/deployment/Dockerfile new file mode 100755 index 00000000..68bdb18a --- /dev/null +++ b/nokiav2/deployment/Dockerfile @@ -0,0 +1,20 @@ +FROM centos:7 +WORKDIR /service +ARG REPO +ARG MODE +COPY src/main/resources/docker-entrypoint.sh . +COPY src/main/resources/LICENSE ./ONAP_LICENSE +COPY src/main/resources/application.properties . +RUN sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf +RUN sed -i 's|#baseurl=http://mirror.centos.org/centos|baseurl=http://mirrors.ocf.berkeley.edu/centos|' /etc/yum.repos.d/*.repo +RUN yum -y update && \ + yum -y install java-1.8.0-openjdk-headless wget && \ + yum -y install mc vim tcpdump net-tools nc strace telnet unzip && \ + yum clean all +COPY pom.xml pom.xml +RUN VERSION=`echo -e "setns x=http://maven.apache.org/POM/4.0.0 \n xpath /x:project/x:version/text() "| xmllint --shell pom.xml | grep content | sed 's/.*content=//'| sed 's/-SNAPSHOT//'` ; wget -q -O driver.war "https://nexus.onap.org/service/local/artifact/maven/redirect?r=${REPO}&g=org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2&a=driverwar&v=${VERSION}${MODE}&e=war" +#Can be used for local builds instead of the previous line +#COPY driver.war . +ENV JAVA_HOME /usr/lib/jvm/jre +EXPOSE 8089 +ENTRYPOINT /service/docker-entrypoint.sh diff --git a/nokiav2/deployment/src/main/resources/Dockerfile b/nokiav2/deployment/src/main/resources/Dockerfile deleted file mode 100755 index 7509f55a..00000000 --- a/nokiav2/deployment/src/main/resources/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM centos:7 -WORKDIR /service -ARG VERSION -COPY docker-entrypoint.sh . -COPY LICENSE ./ONAP_LICENSE -COPY application.properties . -RUN sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf -RUN sed -i 's|#baseurl=http://mirror.centos.org/centos|baseurl=http://mirrors.ocf.berkeley.edu/centos|' /etc/yum.repos.d/*.repo -RUN yum -y update && \ - yum -y install java-1.8.0-openjdk-headless wget && \ - yum -y install mc vim tcpdump net-tools nc strace telnet unzip xmlstarlet && \ - yum clean all -RUN wget -q -O driver.war "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2&a=driverwar&v=${VERSION}&e=war" -#Can be used for local builds -#COPY driver.war . -ENV JAVA_HOME /usr/lib/jvm/jre -EXPOSE 8089 -ENTRYPOINT /service/docker-entrypoint.sh diff --git a/nokiav2/deployment/src/main/resources/build_image.sh b/nokiav2/deployment/src/main/resources/build_image.sh deleted file mode 100755 index 1f78999d..00000000 --- a/nokiav2/deployment/src/main/resources/build_image.sh +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/bash -# -# Copyright 2017, Nokia Corporation -# -# 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. -# - -if [ "a$1" != "abuildDocker" ] ; then - echo "Skipping building Docker image" - echo "If you would like to build the docker image by script execute $0 buildDocker" - echo "If you would like to build and push the docker image by script execute $0 buildDocker pushImage" - echo "If you would like to build the docker image by maven execute mvn package -Dexec.args=\"buildDocker\"" - echo "If you would like to push the docker image by maven execute mvn package -Dexec.args=\"buildDocker pushImage\"" - exit -fi - -DIRNAME=`dirname $0` -DOCKER_BUILD_DIR=`cd $DIRNAME/; pwd` -echo "----- Build directory ${DOCKER_BUILD_DIR}" -cd ${DOCKER_BUILD_DIR} - -#VERSION=`xmlstarlet sel -t -v "/_:project/_:version" ../../../pom.xml | sed 's/-SNAPSHOT//g'` -VERSION="1.1.0-SNAPSHOT" -echo "------ Detected version: $VERSION" - -PROJECT="vfc" -IMAGE="nfvo/svnfm/nokiav2" -DOCKER_REPOSITORY="nexus3.onap.org:10003" -ORG="onap" -BUILD_ARGS="--no-cache" -# it looks like that ONAP jenkins does not support squash -#BUILD_ARGS="--no-cache --squash" - -IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}" -TIMESTAMP=$(date +"%Y%m%dT%H%M%S") - -if [ $HTTP_PROXY ]; then - echo "----- Using HTTP proxy ${HTTP_PROXY}" - BUILD_ARGS+=" --build-arg HTTP_PROXY=${HTTP_PROXY}" -fi - -if [ $HTTPS_PROXY ]; then - echo "----- Using HTTPS proxy ${HTTPS_PROXY}" - BUILD_ARGS+=" --build-arg HTTPS_PROXY=${HTTPS_PROXY}" -fi - -function build_image { - echo "Start build docker image: ${IMAGE_NAME}" - echo "docker build --build-arg VERSION=${VERSION} ${BUILD_ARGS} -t ${IMAGE_NAME}:latest ." - docker build --build-arg VERSION=${VERSION} ${BUILD_ARGS} -t ${IMAGE_NAME}:latest . -} - -function push_image_tag { - TAG_NAME=$1 - echo "Start push ${TAG_NAME}" - docker tag ${IMAGE_NAME}:latest ${TAG_NAME} - docker push ${TAG_NAME} -} - -function push_image { - echo "Start push ${IMAGE_NAME}:latest" - docker push ${IMAGE_NAME}:latest - - push_image_tag ${IMAGE_NAME}:${VERSION}-SNAPSHOT-latest - push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-latest - push_image_tag ${IMAGE_NAME}:${VERSION}-STAGING-${TIMESTAMP} -} - -build_image - -if [ "a$2" != "apushImage" ]; then - echo "Skipping image pushing" - echo "If you would like to push the docker image by maven execute mvn package -Dexec.args=\"buildDocker pushImage\"" -else - echo "Pushing image" - push_image -fi -- cgit 1.2.3-korg