Code Review
/
appc
/
deployment.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ODL Neon SR1 upgrade
[appc/deployment.git]
/
installation
/
appc
/
src
/
main
/
docker
/
Dockerfile
diff --git
a/installation/appc/src/main/docker/Dockerfile
b/installation/appc/src/main/docker/Dockerfile
index
c0b18fa
..
56e66a8
100644
(file)
--- a/
installation/appc/src/main/docker/Dockerfile
+++ b/
installation/appc/src/main/docker/Dockerfile
@@
-21,27
+21,37
@@
# ============LICENSE_END============================================
# Base ubuntu with added packages needed for ONAP
# ============LICENSE_END============================================
# Base ubuntu with added packages needed for ONAP
-FROM onap/ccsdk-odlsli-alpine-image:0.
4-STAGING-latest
+FROM onap/ccsdk-odlsli-alpine-image:0.
6.3
MAINTAINER APP-C Team (appc@lists.openecomp.org)
MAINTAINER APP-C Team (appc@lists.openecomp.org)
+# run as root to install ps to comply with karaf scripts
+USER root
+RUN apk add --no-cache procps
+RUN apk add --no-cache openssh
+RUN apk add --no-cache sshpass
+
# Set the Env. Variable in the container to add the APPC CONFIG DIR (the SDNC_CONFIG_DIR is inherited from SDNC Image)
ENV APPC_CONFIG_DIR /opt/onap/appc/data/properties
# Copy the opt folder to the container's /opt folder
# Set the Env. Variable in the container to add the APPC CONFIG DIR (the SDNC_CONFIG_DIR is inherited from SDNC Image)
ENV APPC_CONFIG_DIR /opt/onap/appc/data/properties
# Copy the opt folder to the container's /opt folder
-COPY opt /opt
+COPY
--chown=odl:odl
opt /opt
#Copy the directory containing each features' install script
#Copy the directory containing each features' install script
-COPY featureDir /opt/onap/appc/features
+COPY
--chown=odl:odl
featureDir /opt/onap/appc/features
#Copy the directory containing a system folder and an etc folder in order
# to merge both of these with the opendaylight folders of the same names.
#Copy the directory containing a system folder and an etc folder in order
# to merge both of these with the opendaylight folders of the same names.
-COPY repoDir /opt/opendaylight
-
+COPY
--chown=odl:odl
repoDir /opt/opendaylight
+RUN chown -R odl:odl /opt
+USER odl
RUN ln -s /opt/onap/appc /opt/appc
RUN ln -s /opt/onap/appc /opt/appc
+# cvass dir stores VNF's configure via Audit or Sync LCM
+RUN mkdir /opt/onap/appc/cvaas
+
#Start opendaylight and pre-install the appc features
#Start opendaylight and pre-install the appc features
-RUN opt/onap/appc/bin/dockerInstall.sh
+
#
RUN opt/onap/appc/bin/dockerInstall.sh
# Expose port 8181 for ODL REST calls
EXPOSE 8181
# Expose port 8181 for ODL REST calls
EXPOSE 8181