From 90e655269be81aa607c63ab7ab26a77ce0cee012 Mon Sep 17 00:00:00 2001 From: Wouter Born Date: Sun, 14 Jan 2018 14:03:44 +0100 Subject: [PATCH] Port exposal improvements (#157) * Expose specific ports per version * Correct Console port from 5555 to 8101 * Expose LSP port 5007 * Improve documentation Signed-off-by: Wouter Born --- 1.8.3/amd64/alpine/Dockerfile | 6 +++-- 1.8.3/amd64/debian/Dockerfile | 6 +++-- 1.8.3/arm64/alpine/Dockerfile | 6 +++-- 1.8.3/arm64/debian/Dockerfile | 6 +++-- 1.8.3/armhf/alpine/Dockerfile | 6 +++-- 1.8.3/armhf/debian/Dockerfile | 6 +++-- 1.8.3/i386/alpine/Dockerfile | 6 +++-- 1.8.3/i386/debian/Dockerfile | 6 +++-- 2.0.0/amd64/alpine/Dockerfile | 6 +++-- 2.0.0/amd64/debian/Dockerfile | 6 +++-- 2.0.0/arm64/alpine/Dockerfile | 6 +++-- 2.0.0/arm64/debian/Dockerfile | 6 +++-- 2.0.0/armhf/alpine/Dockerfile | 6 +++-- 2.0.0/armhf/debian/Dockerfile | 6 +++-- 2.0.0/i386/alpine/Dockerfile | 6 +++-- 2.0.0/i386/debian/Dockerfile | 6 +++-- 2.1.0/amd64/alpine/Dockerfile | 6 +++-- 2.1.0/amd64/debian/Dockerfile | 6 +++-- 2.1.0/arm64/alpine/Dockerfile | 6 +++-- 2.1.0/arm64/debian/Dockerfile | 6 +++-- 2.1.0/armhf/alpine/Dockerfile | 6 +++-- 2.1.0/armhf/debian/Dockerfile | 6 +++-- 2.1.0/i386/alpine/Dockerfile | 6 +++-- 2.1.0/i386/debian/Dockerfile | 6 +++-- 2.2.0/amd64/alpine/Dockerfile | 6 +++-- 2.2.0/amd64/debian/Dockerfile | 6 +++-- 2.2.0/arm64/alpine/Dockerfile | 6 +++-- 2.2.0/arm64/debian/Dockerfile | 6 +++-- 2.2.0/armhf/alpine/Dockerfile | 6 +++-- 2.2.0/armhf/debian/Dockerfile | 6 +++-- 2.2.0/i386/alpine/Dockerfile | 6 +++-- 2.2.0/i386/debian/Dockerfile | 6 +++-- 2.3.0-snapshot/amd64/alpine/Dockerfile | 6 +++-- 2.3.0-snapshot/amd64/debian/Dockerfile | 6 +++-- 2.3.0-snapshot/arm64/alpine/Dockerfile | 6 +++-- 2.3.0-snapshot/arm64/debian/Dockerfile | 6 +++-- 2.3.0-snapshot/armhf/alpine/Dockerfile | 6 +++-- 2.3.0-snapshot/armhf/debian/Dockerfile | 6 +++-- 2.3.0-snapshot/i386/alpine/Dockerfile | 6 +++-- 2.3.0-snapshot/i386/debian/Dockerfile | 6 +++-- README.md | 11 +++++---- update.sh | 33 +++++++++++++++++++++++--- 42 files changed, 197 insertions(+), 87 deletions(-) diff --git a/1.8.3/amd64/alpine/Dockerfile b/1.8.3/amd64/alpine/Dockerfile index 461fe9b..02d0481 100644 --- a/1.8.3/amd64/alpine/Dockerfile +++ b/1.8.3/amd64/alpine/Dockerfile @@ -76,9 +76,11 @@ VOLUME ${APPDIR}/configurations ${APPDIR}/addons RUN apk del build-dependencies && \ rm -rf /var/cache/apk/* -# Set working directory, expose and entrypoint +# Expose HTTP and HTTPS ports +EXPOSE 8080 8443 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/1.8.3/amd64/debian/Dockerfile b/1.8.3/amd64/debian/Dockerfile index 81d7072..0b38510 100644 --- a/1.8.3/amd64/debian/Dockerfile +++ b/1.8.3/amd64/debian/Dockerfile @@ -97,9 +97,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \ DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* -# Set working directory, expose and entrypoint +# Expose HTTP and HTTPS ports +EXPOSE 8080 8443 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/1.8.3/arm64/alpine/Dockerfile b/1.8.3/arm64/alpine/Dockerfile index 8d2a888..be3fddb 100644 --- a/1.8.3/arm64/alpine/Dockerfile +++ b/1.8.3/arm64/alpine/Dockerfile @@ -76,9 +76,11 @@ VOLUME ${APPDIR}/configurations ${APPDIR}/addons RUN apk del build-dependencies && \ rm -rf /var/cache/apk/* -# Set working directory, expose and entrypoint +# Expose HTTP and HTTPS ports +EXPOSE 8080 8443 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/1.8.3/arm64/debian/Dockerfile b/1.8.3/arm64/debian/Dockerfile index b7948a7..357a635 100644 --- a/1.8.3/arm64/debian/Dockerfile +++ b/1.8.3/arm64/debian/Dockerfile @@ -102,9 +102,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \ DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* -# Set working directory, expose and entrypoint +# Expose HTTP and HTTPS ports +EXPOSE 8080 8443 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/1.8.3/armhf/alpine/Dockerfile b/1.8.3/armhf/alpine/Dockerfile index f97d53a..dbd9dcf 100644 --- a/1.8.3/armhf/alpine/Dockerfile +++ b/1.8.3/armhf/alpine/Dockerfile @@ -76,9 +76,11 @@ VOLUME ${APPDIR}/configurations ${APPDIR}/addons RUN apk del build-dependencies && \ rm -rf /var/cache/apk/* -# Set working directory, expose and entrypoint +# Expose HTTP and HTTPS ports +EXPOSE 8080 8443 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/1.8.3/armhf/debian/Dockerfile b/1.8.3/armhf/debian/Dockerfile index 62f265e..9565da7 100644 --- a/1.8.3/armhf/debian/Dockerfile +++ b/1.8.3/armhf/debian/Dockerfile @@ -97,9 +97,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \ DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* -# Set working directory, expose and entrypoint +# Expose HTTP and HTTPS ports +EXPOSE 8080 8443 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/1.8.3/i386/alpine/Dockerfile b/1.8.3/i386/alpine/Dockerfile index 1eea2ed..75ce45f 100644 --- a/1.8.3/i386/alpine/Dockerfile +++ b/1.8.3/i386/alpine/Dockerfile @@ -76,9 +76,11 @@ VOLUME ${APPDIR}/configurations ${APPDIR}/addons RUN apk del build-dependencies && \ rm -rf /var/cache/apk/* -# Set working directory, expose and entrypoint +# Expose HTTP and HTTPS ports +EXPOSE 8080 8443 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/1.8.3/i386/debian/Dockerfile b/1.8.3/i386/debian/Dockerfile index 6499e8a..26e5399 100644 --- a/1.8.3/i386/debian/Dockerfile +++ b/1.8.3/i386/debian/Dockerfile @@ -97,9 +97,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \ DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* -# Set working directory, expose and entrypoint +# Expose HTTP and HTTPS ports +EXPOSE 8080 8443 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.0.0/amd64/alpine/Dockerfile b/2.0.0/amd64/alpine/Dockerfile index 0600e61..8d80899 100644 --- a/2.0.0/amd64/alpine/Dockerfile +++ b/2.0.0/amd64/alpine/Dockerfile @@ -80,9 +80,11 @@ VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons RUN apk del build-dependencies && \ rm -rf /var/cache/apk/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS and Console ports +EXPOSE 8080 8443 8101 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.0.0/amd64/debian/Dockerfile b/2.0.0/amd64/debian/Dockerfile index 87c8846..9e88ab2 100644 --- a/2.0.0/amd64/debian/Dockerfile +++ b/2.0.0/amd64/debian/Dockerfile @@ -101,9 +101,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \ DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS and Console ports +EXPOSE 8080 8443 8101 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.0.0/arm64/alpine/Dockerfile b/2.0.0/arm64/alpine/Dockerfile index 5328b44..45b041d 100644 --- a/2.0.0/arm64/alpine/Dockerfile +++ b/2.0.0/arm64/alpine/Dockerfile @@ -80,9 +80,11 @@ VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons RUN apk del build-dependencies && \ rm -rf /var/cache/apk/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS and Console ports +EXPOSE 8080 8443 8101 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.0.0/arm64/debian/Dockerfile b/2.0.0/arm64/debian/Dockerfile index a5fba94..fada513 100644 --- a/2.0.0/arm64/debian/Dockerfile +++ b/2.0.0/arm64/debian/Dockerfile @@ -106,9 +106,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \ DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS and Console ports +EXPOSE 8080 8443 8101 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.0.0/armhf/alpine/Dockerfile b/2.0.0/armhf/alpine/Dockerfile index 9588c27..a1ce604 100644 --- a/2.0.0/armhf/alpine/Dockerfile +++ b/2.0.0/armhf/alpine/Dockerfile @@ -80,9 +80,11 @@ VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons RUN apk del build-dependencies && \ rm -rf /var/cache/apk/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS and Console ports +EXPOSE 8080 8443 8101 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.0.0/armhf/debian/Dockerfile b/2.0.0/armhf/debian/Dockerfile index deb099a..94b3659 100644 --- a/2.0.0/armhf/debian/Dockerfile +++ b/2.0.0/armhf/debian/Dockerfile @@ -101,9 +101,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \ DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS and Console ports +EXPOSE 8080 8443 8101 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.0.0/i386/alpine/Dockerfile b/2.0.0/i386/alpine/Dockerfile index bc8c664..0759309 100644 --- a/2.0.0/i386/alpine/Dockerfile +++ b/2.0.0/i386/alpine/Dockerfile @@ -80,9 +80,11 @@ VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons RUN apk del build-dependencies && \ rm -rf /var/cache/apk/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS and Console ports +EXPOSE 8080 8443 8101 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.0.0/i386/debian/Dockerfile b/2.0.0/i386/debian/Dockerfile index f087a08..878abf5 100644 --- a/2.0.0/i386/debian/Dockerfile +++ b/2.0.0/i386/debian/Dockerfile @@ -101,9 +101,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \ DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS and Console ports +EXPOSE 8080 8443 8101 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.1.0/amd64/alpine/Dockerfile b/2.1.0/amd64/alpine/Dockerfile index bead286..ed37ab6 100644 --- a/2.1.0/amd64/alpine/Dockerfile +++ b/2.1.0/amd64/alpine/Dockerfile @@ -80,9 +80,11 @@ VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons RUN apk del build-dependencies && \ rm -rf /var/cache/apk/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS and Console ports +EXPOSE 8080 8443 8101 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.1.0/amd64/debian/Dockerfile b/2.1.0/amd64/debian/Dockerfile index 343ba80..bba9d28 100644 --- a/2.1.0/amd64/debian/Dockerfile +++ b/2.1.0/amd64/debian/Dockerfile @@ -101,9 +101,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \ DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS and Console ports +EXPOSE 8080 8443 8101 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.1.0/arm64/alpine/Dockerfile b/2.1.0/arm64/alpine/Dockerfile index 57debe7..c80b6c5 100644 --- a/2.1.0/arm64/alpine/Dockerfile +++ b/2.1.0/arm64/alpine/Dockerfile @@ -80,9 +80,11 @@ VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons RUN apk del build-dependencies && \ rm -rf /var/cache/apk/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS and Console ports +EXPOSE 8080 8443 8101 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.1.0/arm64/debian/Dockerfile b/2.1.0/arm64/debian/Dockerfile index 0b56c63..e4cd85c 100644 --- a/2.1.0/arm64/debian/Dockerfile +++ b/2.1.0/arm64/debian/Dockerfile @@ -106,9 +106,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \ DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS and Console ports +EXPOSE 8080 8443 8101 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.1.0/armhf/alpine/Dockerfile b/2.1.0/armhf/alpine/Dockerfile index 8df0a34..5cb8c93 100644 --- a/2.1.0/armhf/alpine/Dockerfile +++ b/2.1.0/armhf/alpine/Dockerfile @@ -80,9 +80,11 @@ VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons RUN apk del build-dependencies && \ rm -rf /var/cache/apk/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS and Console ports +EXPOSE 8080 8443 8101 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.1.0/armhf/debian/Dockerfile b/2.1.0/armhf/debian/Dockerfile index fb6d53b..f896022 100644 --- a/2.1.0/armhf/debian/Dockerfile +++ b/2.1.0/armhf/debian/Dockerfile @@ -101,9 +101,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \ DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS and Console ports +EXPOSE 8080 8443 8101 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.1.0/i386/alpine/Dockerfile b/2.1.0/i386/alpine/Dockerfile index 12a15fa..f7abd1c 100644 --- a/2.1.0/i386/alpine/Dockerfile +++ b/2.1.0/i386/alpine/Dockerfile @@ -80,9 +80,11 @@ VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons RUN apk del build-dependencies && \ rm -rf /var/cache/apk/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS and Console ports +EXPOSE 8080 8443 8101 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.1.0/i386/debian/Dockerfile b/2.1.0/i386/debian/Dockerfile index 20d15b8..c13fed0 100644 --- a/2.1.0/i386/debian/Dockerfile +++ b/2.1.0/i386/debian/Dockerfile @@ -101,9 +101,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \ DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS and Console ports +EXPOSE 8080 8443 8101 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.2.0/amd64/alpine/Dockerfile b/2.2.0/amd64/alpine/Dockerfile index de530d0..bf17069 100644 --- a/2.2.0/amd64/alpine/Dockerfile +++ b/2.2.0/amd64/alpine/Dockerfile @@ -80,9 +80,11 @@ VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons RUN apk del build-dependencies && \ rm -rf /var/cache/apk/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS, Console and LSP ports +EXPOSE 8080 8443 8101 5007 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.2.0/amd64/debian/Dockerfile b/2.2.0/amd64/debian/Dockerfile index 06ce441..4df1454 100644 --- a/2.2.0/amd64/debian/Dockerfile +++ b/2.2.0/amd64/debian/Dockerfile @@ -101,9 +101,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \ DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS, Console and LSP ports +EXPOSE 8080 8443 8101 5007 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.2.0/arm64/alpine/Dockerfile b/2.2.0/arm64/alpine/Dockerfile index 14b4930..8bb6ee6 100644 --- a/2.2.0/arm64/alpine/Dockerfile +++ b/2.2.0/arm64/alpine/Dockerfile @@ -80,9 +80,11 @@ VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons RUN apk del build-dependencies && \ rm -rf /var/cache/apk/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS, Console and LSP ports +EXPOSE 8080 8443 8101 5007 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.2.0/arm64/debian/Dockerfile b/2.2.0/arm64/debian/Dockerfile index 5c8624c..6566986 100644 --- a/2.2.0/arm64/debian/Dockerfile +++ b/2.2.0/arm64/debian/Dockerfile @@ -106,9 +106,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \ DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS, Console and LSP ports +EXPOSE 8080 8443 8101 5007 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.2.0/armhf/alpine/Dockerfile b/2.2.0/armhf/alpine/Dockerfile index 5cd10aa..a3289ea 100644 --- a/2.2.0/armhf/alpine/Dockerfile +++ b/2.2.0/armhf/alpine/Dockerfile @@ -80,9 +80,11 @@ VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons RUN apk del build-dependencies && \ rm -rf /var/cache/apk/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS, Console and LSP ports +EXPOSE 8080 8443 8101 5007 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.2.0/armhf/debian/Dockerfile b/2.2.0/armhf/debian/Dockerfile index cde529e..c333a4f 100644 --- a/2.2.0/armhf/debian/Dockerfile +++ b/2.2.0/armhf/debian/Dockerfile @@ -101,9 +101,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \ DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS, Console and LSP ports +EXPOSE 8080 8443 8101 5007 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.2.0/i386/alpine/Dockerfile b/2.2.0/i386/alpine/Dockerfile index 6baf408..05aa8b6 100644 --- a/2.2.0/i386/alpine/Dockerfile +++ b/2.2.0/i386/alpine/Dockerfile @@ -80,9 +80,11 @@ VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons RUN apk del build-dependencies && \ rm -rf /var/cache/apk/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS, Console and LSP ports +EXPOSE 8080 8443 8101 5007 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.2.0/i386/debian/Dockerfile b/2.2.0/i386/debian/Dockerfile index 8da390c..ac25b3f 100644 --- a/2.2.0/i386/debian/Dockerfile +++ b/2.2.0/i386/debian/Dockerfile @@ -101,9 +101,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \ DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS, Console and LSP ports +EXPOSE 8080 8443 8101 5007 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.3.0-snapshot/amd64/alpine/Dockerfile b/2.3.0-snapshot/amd64/alpine/Dockerfile index e5b67cb..3d1d06d 100644 --- a/2.3.0-snapshot/amd64/alpine/Dockerfile +++ b/2.3.0-snapshot/amd64/alpine/Dockerfile @@ -80,9 +80,11 @@ VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons RUN apk del build-dependencies && \ rm -rf /var/cache/apk/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS, Console and LSP ports +EXPOSE 8080 8443 8101 5007 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.3.0-snapshot/amd64/debian/Dockerfile b/2.3.0-snapshot/amd64/debian/Dockerfile index d264a64..a6c4caf 100644 --- a/2.3.0-snapshot/amd64/debian/Dockerfile +++ b/2.3.0-snapshot/amd64/debian/Dockerfile @@ -101,9 +101,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \ DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS, Console and LSP ports +EXPOSE 8080 8443 8101 5007 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.3.0-snapshot/arm64/alpine/Dockerfile b/2.3.0-snapshot/arm64/alpine/Dockerfile index ee80780..dce7380 100644 --- a/2.3.0-snapshot/arm64/alpine/Dockerfile +++ b/2.3.0-snapshot/arm64/alpine/Dockerfile @@ -80,9 +80,11 @@ VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons RUN apk del build-dependencies && \ rm -rf /var/cache/apk/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS, Console and LSP ports +EXPOSE 8080 8443 8101 5007 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.3.0-snapshot/arm64/debian/Dockerfile b/2.3.0-snapshot/arm64/debian/Dockerfile index cd03b86..179565f 100644 --- a/2.3.0-snapshot/arm64/debian/Dockerfile +++ b/2.3.0-snapshot/arm64/debian/Dockerfile @@ -106,9 +106,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \ DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS, Console and LSP ports +EXPOSE 8080 8443 8101 5007 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.3.0-snapshot/armhf/alpine/Dockerfile b/2.3.0-snapshot/armhf/alpine/Dockerfile index 5e6a202..da69f2d 100644 --- a/2.3.0-snapshot/armhf/alpine/Dockerfile +++ b/2.3.0-snapshot/armhf/alpine/Dockerfile @@ -80,9 +80,11 @@ VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons RUN apk del build-dependencies && \ rm -rf /var/cache/apk/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS, Console and LSP ports +EXPOSE 8080 8443 8101 5007 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.3.0-snapshot/armhf/debian/Dockerfile b/2.3.0-snapshot/armhf/debian/Dockerfile index 0950ba9..cc02ddc 100644 --- a/2.3.0-snapshot/armhf/debian/Dockerfile +++ b/2.3.0-snapshot/armhf/debian/Dockerfile @@ -101,9 +101,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \ DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS, Console and LSP ports +EXPOSE 8080 8443 8101 5007 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.3.0-snapshot/i386/alpine/Dockerfile b/2.3.0-snapshot/i386/alpine/Dockerfile index f7b741a..b46e99f 100644 --- a/2.3.0-snapshot/i386/alpine/Dockerfile +++ b/2.3.0-snapshot/i386/alpine/Dockerfile @@ -80,9 +80,11 @@ VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons RUN apk del build-dependencies && \ rm -rf /var/cache/apk/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS, Console and LSP ports +EXPOSE 8080 8443 8101 5007 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/2.3.0-snapshot/i386/debian/Dockerfile b/2.3.0-snapshot/i386/debian/Dockerfile index f197ad3..33582a8 100644 --- a/2.3.0-snapshot/i386/debian/Dockerfile +++ b/2.3.0-snapshot/i386/debian/Dockerfile @@ -101,9 +101,11 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \ DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \ rm -rf /var/lib/apt/lists/* -# Set working directory, expose and entrypoint +# Expose HTTP, HTTPS, Console and LSP ports +EXPOSE 8080 8443 8101 5007 + +# Set working directory and entrypoint WORKDIR ${APPDIR} -EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] diff --git a/README.md b/README.md index af8554f..6d4fe89 100644 --- a/README.md +++ b/README.md @@ -225,10 +225,13 @@ Before enabling this make sure this is allowed by local laws and you agree with ## Parameters -* `-p 8080` - the port of the webinterface -* `-v /openhab/addons` - custom openhab addons -* `-v /openhab/conf` - openhab configs -* `-v /openhab/userdata` - openhab userdata directory +* `-p 8080` - the HTTP port of the web interface +* `-p 8443` - the HTTPS port of the web interface +* `-p 8101` - the SSH port of the [Console](https://docs.openhab.org/administration/console.html) (since openHAB 2.0.0) +* `-p 5007` - the LSP port for [validating rules](https://github.com/openhab/openhab-vscode#validating-the-rules) (since openHAB 2.2.0) +* `-v /openhab/addons` - custom openHAB addons +* `-v /openhab/conf` - openHAB configs +* `-v /openhab/userdata` - openHAB userdata directory * `--device=/dev/ttyUSB0` - attach your devices like RFXCOM or Z-Wave Sticks to the container ## Upgrading diff --git a/update.sh b/update.sh index 080d12e..6e28d79 100755 --- a/update.sh +++ b/update.sh @@ -290,12 +290,38 @@ print_volumes_old() { EOI } -# Set working directory, expose and entrypoint +print_expose_ports() { + case $version in + 1.8.3) + expose_comment="Expose HTTP and HTTPS ports" + expose_ports="8080 8443" + ;; + 2.0.0|2.1.0) + expose_comment="Expose HTTP, HTTPS and Console ports" + expose_ports="8080 8443 8101" + ;; + 2.2.0|2.3.0-snapshot) + expose_comment="Expose HTTP, HTTPS, Console and LSP ports" + expose_ports="8080 8443 8101 5007" + ;; + default) + expose_comment="Error" + expose_ports="error" + ;; + esac + + cat >> $1 <<-EOI + # $expose_comment + EXPOSE $expose_ports + + EOI +} + +# Set working directory and entrypoint print_entrypoint() { cat >> $1 <<-'EOI' - # Set working directory, expose and entrypoint + # Set working directory and entrypoint WORKDIR ${APPDIR} - EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] @@ -361,6 +387,7 @@ do else print_cleanup $file; fi + print_expose_ports $file print_entrypoint $file print_command $file