diff options
| author |   Zhaoxing <meng.zhaoxing1@zte.com.cn> | 2017-09-29 14:09:19 +0800 |
|---|---|---|
| committer |   Fu Jinhua <fu.jinhua@zte.com.cn> | 2017-09-29 06:46:09 +0000 |
| commit | dd52dc299229243fa34439cf8861dffd359e3e86 (patch) | |
| tree | 654d45e55ade420b6508e9ad9075b3318259d7da /wfenginemgrservice/src | |
| parent | 687a149af6ff59fba9e614e060a598392b68db6b (diff) | |
Fix the docker build error for vfc-nfvo-wfengine
Change-Id: I976ba9df7fb7145563df31f1e6ee3449279fe382
Issue-id: VFC-445
Signed-off-by: Zhaoxing <meng.zhaoxing1@zte.com.cn>
Diffstat (limited to 'wfenginemgrservice/src')
3 files changed, 24 insertions, 4 deletions
diff --git a/wfenginemgrservice/src/main/docker/Dockerfile b/wfenginemgrservice/src/main/docker/Dockerfile index b7d0f6c..7f302dd 100644 --- a/wfenginemgrservice/src/main/docker/Dockerfile +++ b/wfenginemgrservice/src/main/docker/Dockerfile @@ -1,14 +1,15 @@ FROM openjdk:8-jre-alpine -LABEL User=Zhaoxing(mzhx.meng@gmail.com) +LABEL maintainer=Zhaoxing(mzhx.meng@gmail.com) +ENV OPENPALETTE_MSB_IP=127.0.0.1 OPENPALETTE_MSB_PORT=80 WORKDIR /home/onap/workflow/wfenginemgrservice EXPOSE 10550 -ENV OPENPALETTE_MSB_IP=127.0.0.1 OPENPALETTE_MSB_PORT=80 ADD bin /home/onap/workflow/wfenginemgrservice/ RUN chmod 755 /home/onap/workflow/wfenginemgrservice/*.sh -CMD ["/home/onap/workflow/wfenginemgrservice/run.sh"] +ENTRYPOINT ["./entrypoint.sh"] +CMD ["start"] diff --git a/wfenginemgrservice/src/main/docker/bin/entrypoint.sh b/wfenginemgrservice/src/main/docker/bin/entrypoint.sh new file mode 100644 index 0000000..f5d8d8c --- /dev/null +++ b/wfenginemgrservice/src/main/docker/bin/entrypoint.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env sh +# $0 is a script name, +# $1, $2, $3 etc are passed arguments +# $1 is our command +CMD=$1 +case "$CMD" in + "dev" ) + ;; + "start" ) + # we can modify files here, using ENV variables passed in + # "docker create" command. It can't be done during build process. + exec ./run.sh + ;; + * ) + # Run custom command. Thanks to this line we can still use + # "docker run our_image /bin/bash" and it will work + exec $CMD ${@:2} + ;; +esac
\ No newline at end of file diff --git a/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh b/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh index fade340..f5af82c 100644 --- a/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh +++ b/wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh @@ -49,7 +49,7 @@ echo "CURLPROXY=${CURLPROXY}" rm -f ./bin/workflow-engine-mgr-service*.jar echo "${CURLPROXY}" -m 300 -O -J -L "https://nexus.onap.org/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}" LATEST #curl "${CURLPROXY}" -m 300 -O -J -L "https://nexus.onap.org/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}" -wget --output-file=workflow-engine-mgr-service.jar "https://nexus.onap.org/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}" +wget -O workflow-engine-mgr-service.jar "https://nexus.onap.org/service/local/artifact/maven/content?r=${NEXUSREPONAME}&g=org.onap.vfc.nfvo.wfengine&a=workflow-engine-mgr-service&e=jar&v=${VERSION}" mv workflow-engine-mgr-service*.jar ./bin/workflow-engine-mgr-service.jar function build_image { |