Removed comments and extra packages from webserver

Author: trajano

src/docker/webserver/DockerFile

@@ -1,7 +1,7 @@
 FROM ibmcom/ibm-http-server:latest
 
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends unzip wget ca-certificates netcat openssh-server \
+    && apt-get install -y --no-install-recommends unzip wget ca-certificates openssl \
     && rm -rf /var/lib/apt/lists/*
 
 ENV JAVA_VERSION 1.8.0_sr4fp5
@@ -38,7 +38,7 @@ ENV JVM_ARGS=-Dcom.ibm.webserver.plugin.utility.autoAcceptCertificates=true
 RUN /opt/ibm/wlp/bin/installUtility install --acceptLicense restConnector-2.0 restConnector-1.0 dynamicRouting-1.0
 
 # Cleanup
-#RUN apt-get purge -y unzip wget && apt-get -y autoremove
+RUN apt-get purge -y unzip wget && apt-get -y autoremove && rm -rf /var/lib/apt/lists/*
 
 # Add include to the configuration file
 RUN mkdir /share
@@ -47,15 +47,6 @@ COPY defaultClusterPlugin.conf /opt/IBM/HTTPServer/conf/
 COPY plugin-cfg.xml /opt/IBM/HTTPServer/conf/
 RUN echo "Include /opt/IBM/HTTPServer/conf/defaultClusterPlugin.conf" >> /opt/IBM/HTTPServer/conf/httpd.conf
 
-#RUN mkdir /var/run/sshd
-#RUN chmod 0755 /var/run/sshd
-#RUN echo 'root:screencast' | chpasswd
-#RUN sed -i 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
-#RUN sed -i "s/#PasswordAuthentication yes/PasswordAuthentication yes/" /etc/ssh/sshd_config
-#RUN sed 's@session\s*required\s*pam_loginuid.so@session optional pam_loginuid.so@g' -i /etc/pam.d/sshd
-
-EXPOSE 22
 EXPOSE 80
 EXPOSE 443
 CMD ["/work/startHttpServer.sh"]
-#CMD ["/usr/sbin/sshd", "-D"]

src/docker/webserver/startHttpServer.sh

@@ -18,12 +18,8 @@ then
   ) 200> /share/gskapicmd.lock
 fi
 
-# Generate key stores for Dynamic Routing use shorter password because of format issues.
-PASSWORD=$(openssl rand -hex 16)
-echo $PASSWORD
-
 mkdir -p /opt/IBM/WebSphere/Plugins/config/webserver1
-gskcapicmd -keydb -create -db /opt/IBM/WebSphere/Plugins/config/webserver1/plugin-key.kdb -pw $PASSWORD -stash
+gskcapicmd -keydb -create -db /opt/IBM/WebSphere/Plugins/config/webserver1/plugin-key.kdb -genpw -stash
 # Keep on trying until the configuration file is generated
 while [ ! -e /defaultCluster-plugin-cfg.xml ]
 do
@@ -48,48 +44,7 @@ done
 sed -i 's#<Uri AffinityCookie="JSESSIONID" AffinityURLIdentifier="jsessionid" Name="/IBMJMXConnectorREST/\*"/>##' /defaultCluster-plugin-cfg.xml
 sed -i 's#<Uri AffinityCookie="JSESSIONID" AffinityURLIdentifier="jsessionid" Name="/ibm/api/\*"/>##' /defaultCluster-plugin-cfg.xml
 
-# /opt/ibm/wlp/bin/dynamicRouting genKeystore \
-#   --host=controller \
-#   --user=adminUser \
-#   --password=adminPassword \
-#   --port=9443 \
-#   --keystorePassword="$PASSWORD" \
-#   --autoAcceptCertificates
-
-# /opt/ibm/wlp/bin/dynamicRouting genKeystore   --host=controller   --user=adminUser   --password=adminPassword   --port=9443   --keystorePassword=foofoo   --autoAcceptCertificates
-
-# +CXlp+VS1yOKDqzSp21Jtd1RWfX4cM5Bh1UKfqNA2HU=
-# Convert to .p12 first to make it work with gskcapicmd
-mkdir -p /opt/IBM/WebSphere/Plugins/config/webserver1
-# /opt/IBM/HTTPServer/bin/gskcmd -keydb -convert \
-#   -pw "$PASSWORD" \
-#   -db /plugin-key.jks \
-#   -target /tmp/plugin-key.p12 \
-#   -new_format p12 
-# /opt/IBM/HTTPServer/bin/gskcapicmd -keydb -convert \
-#   -pw "$PASSWORD" \
-#   -db /tmp/plugin-key.p12 \
-#   -target /opt/IBM/WebSphere/Plugins/config/webserver1/plugin-key.kdb \
-#   -new_format cms
-# /opt/IBM/HTTPServer/bin/gskcapicmd -cert -setdefault \
-#   -pw "$PASSWORD" \
-#   -db /opt/IBM/WebSphere/Plugins/config/webserver1/plugin-key.kdb \
-#   -label default
-
-# cat /opt/IBM/HTTPServer/conf/java.security.append >> /opt/IBM/HTTPServer/java/8.0/jre/lib/security/java.security
-# gskcmd -keydb -convert \
-#   -pw "$PASSWORD" \
-#   -db /plugin-key.jks \
-#   -target /opt/IBM/WebSphere/Plugins/config/webserver1/plugin-key.kdb \
-#   -new_format cms \
-#   -stash && \
-# gskcmd -cert -setdefault \
-#   -stashed \
-#   -db /opt/IBM/WebSphere/Plugins/config/webserver1/plugin-key.kdb \
-#   -label default
-
-
+# Make directory used for the plugin logs
 mkdir -p /opt/IBM/WebSphere/Plugins/logs/webserver1
-#mv /tmp/plugin-key.* /opt/IBM/WebSphere/Plugins/config/webserver1
 
 exec /work/ihsstart.sh