aboutsummaryrefslogtreecommitdiffstats
path: root/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile
diff options
context:
space:
mode:
Diffstat (limited to 'vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile')
-rw-r--r--vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile15
1 files changed, 7 insertions, 8 deletions
diff --git a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile
index 87114c93..209cfea1 100644
--- a/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile
+++ b/vnfmarket-be/deployment/docker/docker-refrepo/src/main/docker/Dockerfile
@@ -19,16 +19,15 @@ ENV JAVA_HOME /usr/lib/jvm/jre
WORKDIR /service
# 20-mysq.txt
-RUN yum install epel-release
-RUN yum install nginx && \
+RUN yum -y install epel-release
+RUN yum -y install nginx && \
mkdir -p /etc/nginx/ssl
COPY nginx.conf /etc/nginx/nginx.conf
COPY certgen.sh .
-CMD chmod +x ./certgen.sh && \
- ./certgen.sh
-COPY example.key example.cert /etc/nginx/ssl/
-#CMD service nginx start
-
+CMD chmod +x ./certgen.sh
+RUN ./certgen.sh
+# && systemctl start nginx
+
# Set up mysql
RUN wget -q http://repo.mysql.com/mysql-community-release-el7-5.noarch.rpm && rpm -ivh mysql-community-release-el7-5.noarch.rpm && rm -f mysql-community-release-el7-5.noarch.rpm
RUN yum -y update
@@ -38,7 +37,7 @@ COPY init-mysql.sh .
# 30-tomcat.txt - AUTOGENERATED, DO NOT MODIFY MANUALLY
# Set up tomcat
-RUN wget -q http://mirrors.ocf.berkeley.edu/apache/tomcat/tomcat-8/v8.5.23/bin/apache-tomcat-8.5.23.tar.gz && tar --strip-components=1 -xf apache-tomcat-8.5.23.tar.gz && rm -f apache-tomcat-8.5.23.tar.gz && rm -rf webapps && mkdir -p webapps/ROOT
+RUN wget -q http://mirrors.ocf.berkeley.edu/apache/tomcat/tomcat-8/v8.5.27/bin/apache-tomcat-8.5.27.tar.gz && tar --strip-components=1 -xf apache-tomcat-8.5.27.tar.gz && rm -f apache-tomcat-8.5.27.tar.gz && rm -rf webapps && mkdir -p webapps/ROOT
RUN echo 'export CATALINA_OPTS="$CATALINA_OPTS -Xms64m -Xmx256m -XX:MaxPermSize=64m"' > /service/bin/setenv.sh
ENV CATALINA_HOME /service