summaryrefslogtreecommitdiffstats
path: root/lcm/docker
diff options
context:
space:
mode:
authoryangyan <yangyanyj@chinamobile.com>2019-04-10 11:27:10 +0800
committeryangyan <yangyanyj@chinamobile.com>2019-04-10 11:27:18 +0800
commitd3ee15efd3de503e9185f6108abcde4cf9308c42 (patch)
tree287ee88a17dce8d923198fb32c5fc17a3e31332e /lcm/docker
parent25c99551231133280eabc5467b9e3740b41b93b2 (diff)
Add https support for project
Change-Id: I9313d049b72a85cd8f367e49de3a1057435d3cf5 Issue-ID: VFC-1342 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
Diffstat (limited to 'lcm/docker')
-rwxr-xr-xlcm/docker/Dockerfile5
-rwxr-xr-xlcm/docker/instance_init.sh4
2 files changed, 6 insertions, 3 deletions
diff --git a/lcm/docker/Dockerfile b/lcm/docker/Dockerfile
index 12899899..215e0920 100755
--- a/lcm/docker/Dockerfile
+++ b/lcm/docker/Dockerfile
@@ -11,6 +11,7 @@ RUN sed -i "s|set compatible|set nocompatible|" /etc/vim/vimrc.tiny
RUN echo "set backspace=2" >> /etc/vim/vimrc.tiny
RUN apt-get update && \
+ apt-get install -y wget unzip gcc libssl-dev && \
apt-get install -y python-virtualenv && \
apt-get install -y python-setuptools && \
apt-get install -y python-dev && \
@@ -22,7 +23,7 @@ RUN apt-get update && \
apt-get install -y unzip && \
apt-get install -y curl && \
apt-get install -y build-essential && \
- apt-get install -y libssl-dev && \
+# apt-get install -y libssl-dev && \
apt-get install -y libffi-dev && \
groupadd -r onap && useradd -r -g onap onap && \
chmod u+w /etc/sudoers && \
@@ -41,6 +42,8 @@ RUN wget -q -O vfc-gvnfm-vnflcm-lcm.zip 'https://nexus.onap.org/service/local/ar
WORKDIR /service/vfc/gvnfm/vnflcm/lcm
RUN pip install -r requirements.txt
+RUN apt-get --purge remove -y wget unzip gcc libssl-dev
+
EXPOSE 8801
USER onap
WORKDIR /service
diff --git a/lcm/docker/instance_init.sh b/lcm/docker/instance_init.sh
index 88a9c4e0..834b8b4a 100755
--- a/lcm/docker/instance_init.sh
+++ b/lcm/docker/instance_init.sh
@@ -27,6 +27,6 @@ GET_VNFM_DB="show databases like 'gvnfm';"
VNFM_DB=`mysql -u$MYSQL_ROOT_USER -p$MYSQL_ROOT_PASSWORD -P$MYSQL_PORT -h$MYSQL_IP -e "$GET_VNFM_DB"`
if [[ "$VNFM_DB" == "" ]]; then
create_database
-
+ migrate_database
fi
-migrate_database
+