Remove HTTP2 modules from Jetty startup

Signed-off-by: Claudio Mezzasalma <claudio.mezzasalma@eurotech.com>
eclipse · Jan 15, 2019 · 33b6d84 · 33b6d84
1 parent 0dd1b57
commit 33b6d84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/assembly/jetty-base/docker/Dockerfile b/assembly/jetty-base/docker/Dockerfile
@@ -23,7 +23,7 @@ RUN useradd -u 1000 -g 0 -d '/var/opt/jetty' -s '/sbin/nologin' jetty && \
     tar --strip=1 -xzf /tmp/jetty.tar.gz -C /opt/jetty && \
     rm -f /tmp/jetty.tar.gz && \
     cd /var/opt/jetty && \
-    java -jar /opt/jetty/start.jar --approve-all-licenses --create-startd --add-to-start=http,http2,https,jsp,jstl,websocket,deploy,logging-logback,jmx,ssl,stats && \
+    java -jar /opt/jetty/start.jar --approve-all-licenses --create-startd --add-to-start=http,https,jsp,jstl,websocket,deploy,logging-logback,jmx,ssl,stats && \
     chown -R 1000:0 /opt/jetty /var/opt/jetty && \
     chmod -R g=u /opt/jetty /var/opt/jetty
 

diff --git a/assembly/jetty-base/entrypoint/run-jetty b/assembly/jetty-base/entrypoint/run-jetty
@@ -57,6 +57,7 @@ if [ "${KAPUA_DISABLE_SSL}" == "false" ]; then
 
 else
     rm -f ${JETTY_BASE}/start.d/https.ini
+    rm -f ${JETTY_BASE}/start.d/ssl.ini
 fi
 
 # Start Jetty