Reduce image sizes, shutdown container gracefully, add 2.4.0.M7 (#212)
* Reduce image sizes * Cleanup APT and APK caches in same layers where they are generated * Remove unused build dependencies dpkg, gnupg * Remove unused Windows batch files * Indent package installation command arguments for better readability * Fix shutdown container gracefully * Add tini to Alpine and Debian images * Add KARAF_EXEC=exec to environment so java replaces bash shell after running start.sh * Start runtime using tini as signal forwarder and process subreaper Fixes #211 Signed-off-by: Wouter Born <eclipse@maindrain.net> * Add 2.4.0.M7 Signed-off-by: Wouter Born <eclipse@maindrain.net>pull/214/head
parent
c126200907
commit
6cd7f5959c
12
.travis.yml
12
.travis.yml
|
@ -58,12 +58,6 @@ env:
|
|||
- VERSION=2.3.0 DIST=debian TARGET=amd64
|
||||
- VERSION=2.3.0 DIST=debian TARGET=arm64
|
||||
- VERSION=2.3.0 DIST=debian TARGET=armhf
|
||||
- VERSION=2.4.0.M4 DIST=alpine TARGET=amd64
|
||||
- VERSION=2.4.0.M4 DIST=alpine TARGET=arm64
|
||||
- VERSION=2.4.0.M4 DIST=alpine TARGET=armhf
|
||||
- VERSION=2.4.0.M4 DIST=debian TARGET=amd64
|
||||
- VERSION=2.4.0.M4 DIST=debian TARGET=arm64
|
||||
- VERSION=2.4.0.M4 DIST=debian TARGET=armhf
|
||||
- VERSION=2.4.0.M5 DIST=alpine TARGET=amd64
|
||||
- VERSION=2.4.0.M5 DIST=alpine TARGET=arm64
|
||||
- VERSION=2.4.0.M5 DIST=alpine TARGET=armhf
|
||||
|
@ -76,6 +70,12 @@ env:
|
|||
- VERSION=2.4.0.M6 DIST=debian TARGET=amd64
|
||||
- VERSION=2.4.0.M6 DIST=debian TARGET=arm64
|
||||
- VERSION=2.4.0.M6 DIST=debian TARGET=armhf
|
||||
- VERSION=2.4.0.M7 DIST=alpine TARGET=amd64
|
||||
- VERSION=2.4.0.M7 DIST=alpine TARGET=arm64
|
||||
- VERSION=2.4.0.M7 DIST=alpine TARGET=armhf
|
||||
- VERSION=2.4.0.M7 DIST=debian TARGET=amd64
|
||||
- VERSION=2.4.0.M7 DIST=debian TARGET=arm64
|
||||
- VERSION=2.4.0.M7 DIST=debian TARGET=armhf
|
||||
- VERSION=2.4.0-snapshot DIST=alpine TARGET=amd64
|
||||
- VERSION=2.4.0-snapshot DIST=alpine TARGET=arm64
|
||||
- VERSION=2.4.0-snapshot DIST=alpine TARGET=armhf
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -69,7 +71,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
|
||||
# Install openHAB
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
cp -a "${APPDIR}/configurations" "${APPDIR}/configurations.dist" && \
|
||||
echo 'export TERM=${TERM:=dumb}' | tee -a ~/.bashrc
|
||||
|
@ -77,10 +79,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/configurations ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP and HTTPS ports
|
||||
EXPOSE 8080 8443
|
||||
|
||||
|
@ -91,4 +89,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -116,7 +116,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -74,7 +79,7 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
|
||||
# Install openHAB
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
cp -a "${APPDIR}/configurations" "${APPDIR}/configurations.dist" && \
|
||||
echo 'export TERM=${TERM:=dumb}' | tee -a ~/.bashrc
|
||||
|
@ -82,12 +87,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/configurations ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP and HTTPS ports
|
||||
EXPOSE 8080 8443
|
||||
|
||||
|
@ -98,4 +97,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -69,7 +71,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
|
||||
# Install openHAB
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
cp -a "${APPDIR}/configurations" "${APPDIR}/configurations.dist" && \
|
||||
echo 'export TERM=${TERM:=dumb}' | tee -a ~/.bashrc
|
||||
|
@ -77,10 +79,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/configurations ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP and HTTPS ports
|
||||
EXPOSE 8080 8443
|
||||
|
||||
|
@ -91,4 +89,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -116,7 +116,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -74,12 +79,14 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
|
||||
RUN dpkg --add-architecture armhf && \
|
||||
apt-get update && \
|
||||
apt-get install --no-install-recommends -y \
|
||||
libc6:armhf
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
libc6:armhf && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install openHAB
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
cp -a "${APPDIR}/configurations" "${APPDIR}/configurations.dist" && \
|
||||
echo 'export TERM=${TERM:=dumb}' | tee -a ~/.bashrc
|
||||
|
@ -87,12 +94,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/configurations ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP and HTTPS ports
|
||||
EXPOSE 8080 8443
|
||||
|
||||
|
@ -103,4 +104,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -69,7 +71,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
|
||||
# Install openHAB
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
cp -a "${APPDIR}/configurations" "${APPDIR}/configurations.dist" && \
|
||||
echo 'export TERM=${TERM:=dumb}' | tee -a ~/.bashrc
|
||||
|
@ -77,10 +79,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/configurations ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP and HTTPS ports
|
||||
EXPOSE 8080 8443
|
||||
|
||||
|
@ -91,4 +89,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -116,7 +116,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -74,7 +79,7 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
|
||||
# Install openHAB
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
cp -a "${APPDIR}/configurations" "${APPDIR}/configurations.dist" && \
|
||||
echo 'export TERM=${TERM:=dumb}' | tee -a ~/.bashrc
|
||||
|
@ -82,12 +87,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/configurations ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP and HTTPS ports
|
||||
EXPOSE 8080 8443
|
||||
|
||||
|
@ -98,4 +97,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -70,7 +72,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -81,10 +83,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP, HTTPS and Console ports
|
||||
EXPOSE 8080 8443 8101
|
||||
|
||||
|
@ -95,4 +93,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -124,7 +124,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -75,7 +80,7 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -86,12 +91,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP, HTTPS and Console ports
|
||||
EXPOSE 8080 8443 8101
|
||||
|
||||
|
@ -102,4 +101,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -70,7 +72,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -81,10 +83,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP, HTTPS and Console ports
|
||||
EXPOSE 8080 8443 8101
|
||||
|
||||
|
@ -95,4 +93,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -124,7 +124,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -74,13 +79,15 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
|
||||
RUN dpkg --add-architecture armhf && \
|
||||
apt-get update && \
|
||||
apt-get install --no-install-recommends -y \
|
||||
libc6:armhf
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
libc6:armhf && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -91,12 +98,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP, HTTPS and Console ports
|
||||
EXPOSE 8080 8443 8101
|
||||
|
||||
|
@ -107,4 +108,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -70,7 +72,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -81,10 +83,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP, HTTPS and Console ports
|
||||
EXPOSE 8080 8443 8101
|
||||
|
||||
|
@ -95,4 +93,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -124,7 +124,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -75,7 +80,7 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -86,12 +91,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP, HTTPS and Console ports
|
||||
EXPOSE 8080 8443 8101
|
||||
|
||||
|
@ -102,4 +101,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -70,7 +72,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -81,10 +83,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP, HTTPS and Console ports
|
||||
EXPOSE 8080 8443 8101
|
||||
|
||||
|
@ -95,4 +93,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -124,7 +124,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -75,7 +80,7 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -86,12 +91,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP, HTTPS and Console ports
|
||||
EXPOSE 8080 8443 8101
|
||||
|
||||
|
@ -102,4 +101,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -70,7 +72,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -81,10 +83,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP, HTTPS and Console ports
|
||||
EXPOSE 8080 8443 8101
|
||||
|
||||
|
@ -95,4 +93,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -124,7 +124,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -74,13 +79,15 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
|
||||
RUN dpkg --add-architecture armhf && \
|
||||
apt-get update && \
|
||||
apt-get install --no-install-recommends -y \
|
||||
libc6:armhf
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
libc6:armhf && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -91,12 +98,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP, HTTPS and Console ports
|
||||
EXPOSE 8080 8443 8101
|
||||
|
||||
|
@ -107,4 +108,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -70,7 +72,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -81,10 +83,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP, HTTPS and Console ports
|
||||
EXPOSE 8080 8443 8101
|
||||
|
||||
|
@ -95,4 +93,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -124,7 +124,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -75,7 +80,7 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -86,12 +91,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP, HTTPS and Console ports
|
||||
EXPOSE 8080 8443 8101
|
||||
|
||||
|
@ -102,4 +101,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -70,7 +72,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -81,10 +83,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -95,4 +93,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -124,7 +124,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -75,7 +80,7 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -86,12 +91,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -102,4 +101,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -70,7 +72,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -81,10 +83,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -95,4 +93,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -124,7 +124,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -74,13 +79,15 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
|
||||
RUN dpkg --add-architecture armhf && \
|
||||
apt-get update && \
|
||||
apt-get install --no-install-recommends -y \
|
||||
libc6:armhf
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
libc6:armhf && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -91,12 +98,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -107,4 +108,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -70,7 +72,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -81,10 +83,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -95,4 +93,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -124,7 +124,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -75,7 +80,7 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -86,12 +91,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -102,4 +101,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -70,7 +72,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -81,10 +83,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -95,4 +93,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -124,7 +124,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -75,7 +80,7 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -86,12 +91,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -102,4 +101,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -70,7 +72,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -81,10 +83,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -95,4 +93,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -124,7 +124,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -74,13 +79,15 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
|
||||
RUN dpkg --add-architecture armhf && \
|
||||
apt-get update && \
|
||||
apt-get install --no-install-recommends -y \
|
||||
libc6:armhf
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
libc6:armhf && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -91,12 +98,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -107,4 +108,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -70,7 +72,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -81,10 +83,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -95,4 +93,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -124,7 +124,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -75,7 +80,7 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -86,12 +91,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -102,4 +101,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -70,7 +72,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -81,10 +83,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -95,4 +93,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -124,7 +124,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -75,7 +80,7 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -86,12 +91,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -102,4 +101,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -70,7 +72,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -81,10 +83,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -95,4 +93,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -124,7 +124,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -74,13 +79,15 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
|
||||
RUN dpkg --add-architecture armhf && \
|
||||
apt-get update && \
|
||||
apt-get install --no-install-recommends -y \
|
||||
libc6:armhf
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
libc6:armhf && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -91,12 +98,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -107,4 +108,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -70,7 +72,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -81,10 +83,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -95,4 +93,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -124,7 +124,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -75,7 +80,7 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -86,12 +91,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -102,4 +101,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -70,7 +72,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -81,10 +83,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -95,4 +93,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -124,7 +124,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -75,7 +80,7 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -86,12 +91,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -102,4 +101,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -70,7 +72,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -81,10 +83,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -95,4 +93,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -124,7 +124,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -74,13 +79,15 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
|
||||
RUN dpkg --add-architecture armhf && \
|
||||
apt-get update && \
|
||||
apt-get install --no-install-recommends -y \
|
||||
libc6:armhf
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
libc6:armhf && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -91,12 +98,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -107,4 +108,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -70,7 +72,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -81,10 +83,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -95,4 +93,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -124,7 +124,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -75,7 +80,7 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -86,12 +91,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -102,4 +101,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -70,7 +72,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -81,10 +83,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -95,4 +93,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -124,7 +124,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -75,7 +80,7 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -86,12 +91,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -102,4 +101,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -70,7 +72,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -81,10 +83,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -95,4 +93,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -124,7 +124,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -74,13 +79,15 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
|
||||
RUN dpkg --add-architecture armhf && \
|
||||
apt-get update && \
|
||||
apt-get install --no-install-recommends -y \
|
||||
libc6:armhf
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
libc6:armhf && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -91,12 +98,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -107,4 +108,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -70,7 +72,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -81,10 +83,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -95,4 +93,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -124,7 +124,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -17,13 +17,14 @@ ENV \
|
|||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -75,7 +80,7 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -86,12 +91,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -102,4 +101,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
||||
|
|
|
@ -135,7 +135,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "gosu openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
||||
|
|
|
@ -11,19 +11,20 @@ FROM multiarch/alpine:amd64-v3.8
|
|||
# Set download urls
|
||||
ENV \
|
||||
JAVA_URL="https://www.azul.com/downloads/zulu/zdk-8-ga-linux_x64.tar.gz" \
|
||||
OPENHAB_URL="https://openhab.jfrog.io/openhab/libs-milestone-local/org/openhab/distro/openhab/2.4.0.M4/openhab-2.4.0.M4.zip" \
|
||||
OPENHAB_VERSION="2.4.0.M4"
|
||||
OPENHAB_URL="https://openhab.jfrog.io/openhab/libs-milestone-local/org/openhab/distro/openhab/2.4.0.M7/openhab-2.4.0.M7.zip" \
|
||||
OPENHAB_VERSION="2.4.0.M7"
|
||||
|
||||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -46,21 +47,22 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
|
||||
# Install basepackages
|
||||
RUN apk upgrade --no-cache && \
|
||||
apk add --no-cache --virtual build-dependencies dpkg gnupg && \
|
||||
apk add --no-cache \
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping
|
||||
arping \
|
||||
bash \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
libpcap-dev \
|
||||
shadow \
|
||||
su-exec \
|
||||
tini \
|
||||
ttf-dejavu \
|
||||
openjdk8 \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Limit OpenJDK crypto policy by default to comply with local laws which may prohibit use of unlimited strength cryptography
|
||||
ENV JAVA_HOME='/usr/lib/jvm/java-1.8-openjdk'
|
||||
|
@ -70,7 +72,7 @@ RUN rm -r "$JAVA_HOME/jre/lib/security/policy/unlimited" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -81,10 +83,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN apk del build-dependencies && \
|
||||
rm -rf /var/cache/apk/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -95,4 +93,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["su-exec", "openhab", "./start.sh"]
|
||||
CMD ["su-exec", "openhab", "tini", "-s", "./start.sh"]
|
|
@ -124,7 +124,7 @@ chown -R openhab:openhab ${APPDIR}
|
|||
sync
|
||||
|
||||
# Use server mode with the default command when there is no pseudo-TTY
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab ./start.sh" ]; then
|
||||
if [ "$interactive" == "false" ] && [ "$(IFS=" "; echo "$@")" == "su-exec openhab tini -s ./start.sh" ]; then
|
||||
command=($@ server)
|
||||
exec "${command[@]}"
|
||||
else
|
|
@ -11,19 +11,20 @@ FROM multiarch/debian-debootstrap:amd64-stretch
|
|||
# Set download urls
|
||||
ENV \
|
||||
JAVA_URL="https://www.azul.com/downloads/zulu/zdk-8-ga-linux_x64.tar.gz" \
|
||||
OPENHAB_URL="https://openhab.jfrog.io/openhab/libs-milestone-local/org/openhab/distro/openhab/2.4.0.M4/openhab-2.4.0.M4.zip" \
|
||||
OPENHAB_VERSION="2.4.0.M4"
|
||||
OPENHAB_URL="https://openhab.jfrog.io/openhab/libs-milestone-local/org/openhab/distro/openhab/2.4.0.M7/openhab-2.4.0.M7.zip" \
|
||||
OPENHAB_VERSION="2.4.0.M7"
|
||||
|
||||
# Set variables and locales
|
||||
ENV \
|
||||
APPDIR="/openhab" \
|
||||
CRYPTO_POLICY="limited" \
|
||||
EXTRA_JAVA_OPTS="" \
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443" \
|
||||
KARAF_EXEC="exec" \
|
||||
LC_ALL="en_US.UTF-8" \
|
||||
LANG="en_US.UTF-8" \
|
||||
LANGUAGE="en_US.UTF-8" \
|
||||
CRYPTO_POLICY="limited"
|
||||
OPENHAB_HTTP_PORT="8080" \
|
||||
OPENHAB_HTTPS_PORT="8443"
|
||||
|
||||
# Set arguments on build
|
||||
ARG BUILD_DATE
|
||||
|
@ -47,21 +48,25 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
|
|||
# Install basepackages
|
||||
RUN apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
|
||||
arping \
|
||||
ca-certificates \
|
||||
dirmngr \
|
||||
fontconfig \
|
||||
gnupg \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
arping \
|
||||
ca-certificates \
|
||||
fontconfig \
|
||||
gosu \
|
||||
libpcap-dev \
|
||||
locales \
|
||||
locales-all \
|
||||
netbase \
|
||||
unzip \
|
||||
wget \
|
||||
zip && \
|
||||
chmod u+s /usr/sbin/arping && \
|
||||
ln -s -f /bin/true /usr/bin/chfn
|
||||
ln -s -f /bin/true /usr/bin/chfn && \
|
||||
sed -i 's#stretch#buster#g' /etc/apt/sources.list && \
|
||||
apt-get update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y tini && \
|
||||
sed -i 's#buster#stretch#g' /etc/apt/sources.list && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Install java
|
||||
ENV JAVA_HOME='/usr/lib/java-8'
|
||||
|
@ -75,7 +80,7 @@ RUN wget -nv -O /tmp/java.tar.gz "${JAVA_URL}" && \
|
|||
# Install openHAB
|
||||
# Set permissions for openHAB. Export TERM variable. See issue #30 for details!
|
||||
RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" && \
|
||||
unzip -q /tmp/openhab.zip -d "${APPDIR}" -x "*.bat" && \
|
||||
rm /tmp/openhab.zip && \
|
||||
mkdir -p "${APPDIR}/userdata/logs" && \
|
||||
touch "${APPDIR}/userdata/logs/openhab.log" && \
|
||||
|
@ -86,12 +91,6 @@ RUN wget -nv -O /tmp/openhab.zip "${OPENHAB_URL}" && \
|
|||
# Expose volume with configuration and userdata dir
|
||||
VOLUME ${APPDIR}/conf ${APPDIR}/userdata ${APPDIR}/addons
|
||||
|
||||
# Reduce image size by removing files that are used only for building the image
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get remove -y dirmngr gnupg && \
|
||||
DEBIAN_FRONTEND=noninteractive apt-get autoremove -y && \
|
||||
apt-get clean && \
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# Expose HTTP, HTTPS, Console and LSP ports
|
||||
EXPOSE 8080 8443 8101 5007
|
||||
|
||||
|
@ -102,4 +101,4 @@ RUN chmod +x /entrypoint.sh
|
|||
ENTRYPOINT ["/entrypoint.sh"]
|
||||
|
||||
# Execute command
|
||||
CMD ["gosu", "openhab", "./start.sh"]
|
||||
CMD ["gosu", "openhab", "tini", "-s", "./start.sh"]
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue