diff options
| -rw-r--r-- | vesagent/docker/Dockerfile | 4 | ||||
| -rwxr-xr-x | vesagent/docker/docker-build.sh | 17 |
2 files changed, 4 insertions, 17 deletions
diff --git a/vesagent/docker/Dockerfile b/vesagent/docker/Dockerfile index 3b5b8e4..732a263 100644 --- a/vesagent/docker/Dockerfile +++ b/vesagent/docker/Dockerfile @@ -19,6 +19,10 @@ WORKDIR /opt # Copy the local opt directory contents into the container at /opt ADD opt /opt +#Download vesagent jar from nexus repo and place in /opt +RUN cd /opt/ && \ + wget -O /opt/vesagent-1.0.0-SNAPSHOT.jar 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.openstack.vmware&a=vesagent&v=LATEST&e=jar' + # Install any needed packages specified in requirements.txt RUN pip install -r requirements.txt diff --git a/vesagent/docker/docker-build.sh b/vesagent/docker/docker-build.sh index 2b2f100..0260e9e 100755 --- a/vesagent/docker/docker-build.sh +++ b/vesagent/docker/docker-build.sh @@ -3,23 +3,6 @@ echo "WORKSPACE: ${WORKSPACE}" VERSION="1.0.0-SNAPSHOT" # -# Copy vesagent Uber JAR to docker app directory -# -APP=${WORKSPACE}/vesagent/target/vesagent-${VERSION}.jar - -if [ ! -f "${APP}" ] -then - echo "FATAL error cannot locate ${APP}" - exit 2 -fi - -APP_DIR=${WORKSPACE}/vesagent/docker/opt - -[ -d "${APP_DIR}/vesagent-${VERSION}.jar" ] && rm -rf "${APP_DIR}/vesagent-${VERSION}.jar" - -cp ${APP} ${APP_DIR} - -# # Copy configurations directory # CONF_DIR=${WORKSPACE}/vesagent/etc |