Code Review
/
vid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Let straightforward `vidkeystorepassword` setting in values.yaml
[vid.git]
/
deliveries
/
src
/
main
/
docker
/
docker-files
/
Dockerfile
diff --git
a/deliveries/src/main/docker/docker-files/Dockerfile
b/deliveries/src/main/docker/docker-files/Dockerfile
index
b169aa4
..
f6070d8
100755
(executable)
--- a/
deliveries/src/main/docker/docker-files/Dockerfile
+++ b/
deliveries/src/main/docker/docker-files/Dockerfile
@@
-4,8
+4,6
@@
FROM tomcat:9.0-jre8-alpine
RUN apk update && apk add openjdk8 vim net-tools
RUN adduser --disabled-password onap onap
RUN apk update && apk add openjdk8 vim net-tools
RUN adduser --disabled-password onap onap
-RUN mkdir -p /opt/app
-COPY conf.d/ /etc/onap/vid/conf.d/
# MariaDB variables
ENV VID_MYSQL_HOST="vid-mariadb-docker-instance" \
# MariaDB variables
ENV VID_MYSQL_HOST="vid-mariadb-docker-instance" \
@@
-84,15
+82,12
@@
ENV VID_CONTACT_US_LINK="https://todo_contact_us_link.com" \
# Custom options
ENV JAVA_OPTS="-Xmx1536m -Xms1536m"
# Custom options
ENV JAVA_OPTS="-Xmx1536m -Xms1536m"
-ENV CATALINA_OPTS="-Dvid.keystore.password=${VID_KEYSTORE_PASSWORD} -Dvid.keyalias=vid@vid.onap.org -Dvid.keystore.filename=${VID_KEYSTORE_FILENAME}"
-ADD maven/config/org.onap.vid.jks ${VID_KEYSTORE_FILENAME}
-ADD maven/config/org.onap.vid.trust.jks ${VID_TRUSTSTORE_FILENAME}
ADD maven/config/server.xml ${VID_TOMCAT_PATH}
ADD maven/scripts/*.sh /tmp/vid/
ADD maven/artifacts/vid.war /tmp/vid/stage/
ADD maven/config/server.xml ${VID_TOMCAT_PATH}
ADD maven/scripts/*.sh /tmp/vid/
ADD maven/artifacts/vid.war /tmp/vid/stage/
-RUN chown onap:onap /tmp/vid /usr/local/tomcat
/etc/onap/vid /opt/app
-R
+RUN chown onap:onap /tmp/vid /usr/local/tomcat -R
RUN chmod +x /tmp/vid/localize.sh
USER onap
CMD ["/tmp/vid/localize.sh"]
RUN chmod +x /tmp/vid/localize.sh
USER onap
CMD ["/tmp/vid/localize.sh"]