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
b1e6a88
..
56e66a8
100644
(file)
--- a/
installation/appc/src/main/docker/Dockerfile
+++ b/
installation/appc/src/main/docker/Dockerfile
@@
-21,9
+21,15
@@
# ============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.1
+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
# 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
@@
-37,6
+43,7
@@
COPY --chown=odl:odl featureDir /opt/onap/appc/features
# to merge both of these with the opendaylight folders of the same names.
COPY --chown=odl:odl repoDir /opt/opendaylight
RUN chown -R odl:odl /opt
# to merge both of these with the opendaylight folders of the same names.
COPY --chown=odl:odl repoDir /opt/opendaylight
RUN chown -R odl:odl /opt
+
USER odl
RUN ln -s /opt/onap/appc /opt/appc
USER odl
RUN ln -s /opt/onap/appc /opt/appc
@@
-44,7
+51,7
@@
RUN ln -s /opt/onap/appc /opt/appc
RUN mkdir /opt/onap/appc/cvaas
#Start opendaylight and pre-install the appc features
RUN mkdir /opt/onap/appc/cvaas
#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