summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryangyan <yangyanyj@chinamobile.com>2020-03-04 16:35:40 +0800
committeryangyan <yangyanyj@chinamobile.com>2020-03-04 16:35:46 +0800
commitbb7fe6b7d2c3de9e85a14e843317884a8f585da3 (patch)
tree0372299de9cabb9c4560197abcd384d52ce3d768
parent346e327d3b9f8db7f6c39e6a7db0db2d7420b07e (diff)
Fix type error
Change-Id: Id7d14a1630955c5e2a2067aaee4ffa4649470f6e Issue-ID: VFC-1626 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
-rw-r--r--[-rwxr-xr-x]ems/microservice-standalone/src/main/assembly/docker/Dockerfile0
-rw-r--r--ems/microservice-standalone/src/main/assembly/docker/docker-env-config.sh47
2 files changed, 23 insertions, 24 deletions
diff --git a/ems/microservice-standalone/src/main/assembly/docker/Dockerfile b/ems/microservice-standalone/src/main/assembly/docker/Dockerfile
index f13840a..f13840a 100755..100644
--- a/ems/microservice-standalone/src/main/assembly/docker/Dockerfile
+++ b/ems/microservice-standalone/src/main/assembly/docker/Dockerfile
diff --git a/ems/microservice-standalone/src/main/assembly/docker/docker-env-config.sh b/ems/microservice-standalone/src/main/assembly/docker/docker-env-config.sh
index 84ab986..9cfdeea 100644
--- a/ems/microservice-standalone/src/main/assembly/docker/docker-env-config.sh
+++ b/ems/microservice-standalone/src/main/assembly/docker/docker-env-config.sh
@@ -2,37 +2,36 @@
install_sf(){
- sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf
- sed -i 's|#baseurl=http://mirror.centos.org/centos|baseurl=http://mirrors.ocf.berkeley.edu/centos|' /etc/yum.repos.d/*.repo
- yum -y update
- yum -y install wget unzip socat java-1.8.0-openjdk-headless
- sed -i 's|#networkaddress.cache.ttl=-1|networkaddress.cache.ttl=10|' /usr/lib/jvm/jre/lib/security/java.security
-
- mkdir emsdriver
-
- # get binary zip from nexus
- wget -q -O emsdiver-standalone.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.ems.ems&a=emsdriv
-er-standalone&v=LATEST&e=zip' && \
- unzip emsdiver-standalone.zip -d emsdriver && \
- rm -rf emsdiver-standalone.zip
-
- chmod +x /service/emsdriver/*.sh
- chmod +x /service/emsdriver/docker/*.sh
+ sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf
+ sed -i 's|#baseurl=http://mirror.centos.org/centos|baseurl=http://mirrors.ocf.berkeley.edu/centos|' /etc/yum.repos.d/*.repo
+ yum -y update
+ yum -y install wget unzip socat java-1.8.0-openjdk-headless
+ sed -i 's|#networkaddress.cache.ttl=-1|networkaddress.cache.ttl=10|' /usr/lib/jvm/jre/lib/security/java.security
+
+ mkdir emsdriver
+
+ # get binary zip from nexus
+ wget -q -O emsdiver-standalone.zip 'https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.vfc.nfvo.driver.ems.ems&a=emsdriver-standalone&v=LATEST&e=zip' && \
+ unzip emsdiver-standalone.zip -d emsdriver && \
+ rm -rf emsdiver-standalone.zip
+
+ chmod +x /service/emsdriver/*.sh
+ chmod +x /service/emsdriver/docker/*.sh
}
add_user(){
- useradd onap
- yum -y install sudo
- chmod u+x /etc/sudoers
- sed -i '/Same thing without a password/a\onap ALL=(ALL:ALL) NOPASSWD:ALL' /etc/sudoers
- chmod u-x /etc/sudoers
- chown onap:onap -R /service
+ useradd onap
+ yum -y install sudo
+ chmod u+x /etc/sudoers
+ sed -i '/Same thing without a password/a\onap ALL=(ALL:ALL) NOPASSWD:ALL' /etc/sudoers
+ chmod u-x /etc/sudoers
+ chown onap:onap -R /service
}
clean_sf_cache(){
-
- yum clean all
+
+ yum clean all
}
install_sf