From 1fec1603055d41e4b3ccad29167bd14514a34ab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20H=C3=A4ussler?= Date: Thu, 26 Oct 2017 17:25:35 +0200 Subject: [PATCH] Add label metadata, fix entrypoint_alpine.sh for version 1.8.3 (#115) and fix codacy issue SC2155 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add label metadata Signed-off-by: Christian Häussler (github: @cniweb) * Fix entrypoint_alpine.sh for version 1.8.3 Signed-off-by: Christian Häussler (github: @cniweb) * Fix label-schema.description Signed-off-by: Christian Häussler (github: @cniweb) * Fix codacy issue SC2155 Declare and assign separately to avoid masking return values. See: https://github.com/koalaman/shellcheck/wiki/SC2155 Signed-off-by: Christian Häussler (github: @cniweb) --- .travis.yml | 2 +- 1.8.3/amd64/alpine/Dockerfile | 45 ++++++----- 1.8.3/amd64/alpine/entrypoint.sh | 4 - 1.8.3/amd64/debian/Dockerfile | 44 ++++++----- 1.8.3/arm64/alpine/Dockerfile | 45 ++++++----- 1.8.3/arm64/alpine/entrypoint.sh | 4 - 1.8.3/arm64/debian/Dockerfile | 48 +++++++----- 1.8.3/armhf/alpine/Dockerfile | 45 ++++++----- 1.8.3/armhf/alpine/entrypoint.sh | 4 - 1.8.3/armhf/debian/Dockerfile | 44 ++++++----- 1.8.3/i386/alpine/Dockerfile | 45 ++++++----- 1.8.3/i386/alpine/entrypoint.sh | 4 - 1.8.3/i386/debian/Dockerfile | 44 ++++++----- 2.0.0/amd64/alpine/Dockerfile | 47 ++++++----- 2.0.0/amd64/debian/Dockerfile | 46 ++++++----- 2.0.0/arm64/alpine/Dockerfile | 47 ++++++----- 2.0.0/arm64/debian/Dockerfile | 50 ++++++------ 2.0.0/armhf/alpine/Dockerfile | 47 ++++++----- 2.0.0/armhf/debian/Dockerfile | 46 ++++++----- 2.0.0/i386/alpine/Dockerfile | 47 ++++++----- 2.0.0/i386/debian/Dockerfile | 46 ++++++----- 2.1.0/amd64/alpine/Dockerfile | 47 ++++++----- 2.1.0/amd64/debian/Dockerfile | 46 ++++++----- 2.1.0/arm64/alpine/Dockerfile | 47 ++++++----- 2.1.0/arm64/debian/Dockerfile | 50 ++++++------ 2.1.0/armhf/alpine/Dockerfile | 47 ++++++----- 2.1.0/armhf/debian/Dockerfile | 46 ++++++----- 2.1.0/i386/alpine/Dockerfile | 47 ++++++----- 2.1.0/i386/debian/Dockerfile | 46 ++++++----- 2.2.0-snapshot/amd64/alpine/Dockerfile | 47 ++++++----- 2.2.0-snapshot/amd64/debian/Dockerfile | 46 ++++++----- 2.2.0-snapshot/arm64/alpine/Dockerfile | 47 ++++++----- 2.2.0-snapshot/arm64/debian/Dockerfile | 50 ++++++------ 2.2.0-snapshot/armhf/alpine/Dockerfile | 47 ++++++----- 2.2.0-snapshot/armhf/debian/Dockerfile | 46 ++++++----- 2.2.0-snapshot/i386/alpine/Dockerfile | 47 ++++++----- 2.2.0-snapshot/i386/debian/Dockerfile | 46 ++++++----- update.sh | 103 +++++++++++-------------- 38 files changed, 830 insertions(+), 779 deletions(-) diff --git a/.travis.yml b/.travis.yml index d833236..ea4f2fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: - docker info - docker run --rm --privileged multiarch/qemu-user-static:register --reset install: - - docker build --build-arg VCS_REF=$TRAVIS_COMMIT --build-arg BUILD_DATE=$(date +"%Y-%m-%dT%H:%M:%SZ") -t $DOCKER_REPO:$VERSION-$TARGET-$DIST $VERSION/$TARGET/$DIST + - docker build --build-arg VCS_REF=$TRAVIS_COMMIT --build-arg BUILD_DATE=$(date +"%Y-%m-%dT%H:%M:%SZ") --build-arg VERSION=$VERSION -t $DOCKER_REPO:$VERSION-$TARGET-$DIST $VERSION/$TARGET/$DIST - docker run --rm $DOCKER_REPO:$VERSION-$TARGET-$DIST uname -a after_success: - docker login -e=$DOCKER_EMAIL -u=$DOCKER_USERNAME -p=$DOCKER_PASSWORD diff --git a/1.8.3/amd64/alpine/Dockerfile b/1.8.3/amd64/alpine/Dockerfile index ad74588..f79ff03 100644 --- a/1.8.3/amd64/alpine/Dockerfile +++ b/1.8.3/amd64/alpine/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -43,29 +47,24 @@ ENV \ LANGUAGE=en_US.UTF-8 # Install basepackages -RUN apk update && \ -apk add \ -ca-certificates \ -fontconfig \ -ttf-dejavu \ -libpcap-dev \ -unzip \ -dpkg \ -gnupg \ -wget \ -bash \ -shadow - - # Install java -RUN apk add openjdk8 - - # Install su-exec -RUN apk add su-exec +RUN apk update && apk add \ + ca-certificates \ + fontconfig \ + libpcap-dev \ + unzip \ + dpkg \ + gnupg \ + wget \ + bash \ + shadow \ + openjdk8 \ + su-exec && \ + rm -rf /var/cache/apk/* # Install openhab -RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} &&\ - unzip -q /tmp/openhab.zip -d ${APPDIR} &&\ - rm /tmp/openhab.zip &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ cp -a ${APPDIR}/configurations ${APPDIR}/configurations.dist && \ echo "export TERM=dumb" | tee -a ~/.bashrc @@ -78,6 +77,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["su-exec", "openhab", "./start.sh"] diff --git a/1.8.3/amd64/alpine/entrypoint.sh b/1.8.3/amd64/alpine/entrypoint.sh index 0dcd9a2..f963f23 100644 --- a/1.8.3/amd64/alpine/entrypoint.sh +++ b/1.8.3/amd64/alpine/entrypoint.sh @@ -2,10 +2,6 @@ set -euo pipefail IFS=$'\n\t' -# Deleting instance.properties to avoid karaf PID conflict on restart -# See: https://github.com/openhab/openhab-docker/issues/99 -rm -f /openhab/runtime/instances/instance.properties - # Add openhab user & handle possible device groups for different host systems # Container base image puts dialout on group id 20, uucp on id 10 # GPIO Group for RPI access diff --git a/1.8.3/amd64/debian/Dockerfile b/1.8.3/amd64/debian/Dockerfile index cbc37a5..a65db55 100644 --- a/1.8.3/amd64/debian/Dockerfile +++ b/1.8.3/amd64/debian/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -44,42 +48,44 @@ ENV \ # Install basepackages RUN apt-get update && \ -apt-get install --no-install-recommends -y \ -ca-certificates \ -fontconfig \ -locales \ -locales-all \ -libpcap-dev \ -netbase \ -unzip \ -wget \ -&& rm -rf /var/lib/apt/lists/* + apt-get install --no-install-recommends -y \ + ca-certificates \ + fontconfig \ + locales \ + locales-all \ + libpcap-dev \ + netbase \ + unzip \ + wget && \ + rm -rf /var/lib/apt/lists/* ENV DEBIAN_FRONTEND=noninteractive # Install java ENV JAVA_HOME='/usr/lib/java-8' -RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} &&\ +RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} && \ mkdir ${JAVA_HOME} && \ tar -xvf /tmp/java.tar.gz --strip-components=1 -C ${JAVA_HOME} && \ + rm /tmp/java.tar.gz && \ update-alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 50 && \ update-alternatives --install /usr/bin/javac javac ${JAVA_HOME}/bin/javac 50 # Install gosu ENV GOSU_VERSION 1.10 RUN set -x \ -&& dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ -&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ +&& GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu # Install openhab -RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} &&\ - unzip -q /tmp/openhab.zip -d ${APPDIR} &&\ - rm /tmp/openhab.zip &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ cp -a ${APPDIR}/configurations ${APPDIR}/configurations.dist && \ echo "export TERM=dumb" | tee -a ~/.bashrc @@ -92,6 +98,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["gosu", "openhab", "./start.sh"] diff --git a/1.8.3/arm64/alpine/Dockerfile b/1.8.3/arm64/alpine/Dockerfile index 8a2281e..985769b 100644 --- a/1.8.3/arm64/alpine/Dockerfile +++ b/1.8.3/arm64/alpine/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -43,29 +47,24 @@ ENV \ LANGUAGE=en_US.UTF-8 # Install basepackages -RUN apk update && \ -apk add \ -ca-certificates \ -fontconfig \ -ttf-dejavu \ -libpcap-dev \ -unzip \ -dpkg \ -gnupg \ -wget \ -bash \ -shadow - - # Install java -RUN apk add openjdk8 - - # Install su-exec -RUN apk add su-exec +RUN apk update && apk add \ + ca-certificates \ + fontconfig \ + libpcap-dev \ + unzip \ + dpkg \ + gnupg \ + wget \ + bash \ + shadow \ + openjdk8 \ + su-exec && \ + rm -rf /var/cache/apk/* # Install openhab -RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} &&\ - unzip -q /tmp/openhab.zip -d ${APPDIR} &&\ - rm /tmp/openhab.zip &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ cp -a ${APPDIR}/configurations ${APPDIR}/configurations.dist && \ echo "export TERM=dumb" | tee -a ~/.bashrc @@ -78,6 +77,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["su-exec", "openhab", "./start.sh"] diff --git a/1.8.3/arm64/alpine/entrypoint.sh b/1.8.3/arm64/alpine/entrypoint.sh index 0dcd9a2..f963f23 100644 --- a/1.8.3/arm64/alpine/entrypoint.sh +++ b/1.8.3/arm64/alpine/entrypoint.sh @@ -2,10 +2,6 @@ set -euo pipefail IFS=$'\n\t' -# Deleting instance.properties to avoid karaf PID conflict on restart -# See: https://github.com/openhab/openhab-docker/issues/99 -rm -f /openhab/runtime/instances/instance.properties - # Add openhab user & handle possible device groups for different host systems # Container base image puts dialout on group id 20, uucp on id 10 # GPIO Group for RPI access diff --git a/1.8.3/arm64/debian/Dockerfile b/1.8.3/arm64/debian/Dockerfile index 34de163..ce82668 100644 --- a/1.8.3/arm64/debian/Dockerfile +++ b/1.8.3/arm64/debian/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -44,33 +48,35 @@ ENV \ # Install basepackages RUN apt-get update && \ -apt-get install --no-install-recommends -y \ -ca-certificates \ -fontconfig \ -locales \ -locales-all \ -libpcap-dev \ -netbase \ -unzip \ -wget \ -&& rm -rf /var/lib/apt/lists/* + apt-get install --no-install-recommends -y \ + ca-certificates \ + fontconfig \ + locales \ + locales-all \ + libpcap-dev \ + netbase \ + unzip \ + wget && \ + rm -rf /var/lib/apt/lists/* ENV DEBIAN_FRONTEND=noninteractive # Install java ENV JAVA_HOME='/usr/lib/java-8' -RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} &&\ +RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} && \ mkdir ${JAVA_HOME} && \ tar -xvf /tmp/java.tar.gz --strip-components=1 -C ${JAVA_HOME} && \ + rm /tmp/java.tar.gz && \ update-alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 50 && \ update-alternatives --install /usr/bin/javac javac ${JAVA_HOME}/bin/javac 50 # Install gosu ENV GOSU_VERSION 1.10 RUN set -x \ -&& dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ -&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ +&& GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ @@ -79,13 +85,13 @@ RUN set -x \ RUN dpkg --add-architecture armhf && \ apt-get update && \ apt-get install --no-install-recommends -y \ - libc6:armhf \ - && rm -rf /var/lib/apt/lists/* + libc6:armhf && \ + rm -rf /var/lib/apt/lists/* # Install openhab -RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} &&\ - unzip -q /tmp/openhab.zip -d ${APPDIR} &&\ - rm /tmp/openhab.zip &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ cp -a ${APPDIR}/configurations ${APPDIR}/configurations.dist && \ echo "export TERM=dumb" | tee -a ~/.bashrc @@ -98,6 +104,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["gosu", "openhab", "./start.sh"] diff --git a/1.8.3/armhf/alpine/Dockerfile b/1.8.3/armhf/alpine/Dockerfile index c53e267..57c8189 100644 --- a/1.8.3/armhf/alpine/Dockerfile +++ b/1.8.3/armhf/alpine/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -43,29 +47,24 @@ ENV \ LANGUAGE=en_US.UTF-8 # Install basepackages -RUN apk update && \ -apk add \ -ca-certificates \ -fontconfig \ -ttf-dejavu \ -libpcap-dev \ -unzip \ -dpkg \ -gnupg \ -wget \ -bash \ -shadow - - # Install java -RUN apk add openjdk8 - - # Install su-exec -RUN apk add su-exec +RUN apk update && apk add \ + ca-certificates \ + fontconfig \ + libpcap-dev \ + unzip \ + dpkg \ + gnupg \ + wget \ + bash \ + shadow \ + openjdk8 \ + su-exec && \ + rm -rf /var/cache/apk/* # Install openhab -RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} &&\ - unzip -q /tmp/openhab.zip -d ${APPDIR} &&\ - rm /tmp/openhab.zip &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ cp -a ${APPDIR}/configurations ${APPDIR}/configurations.dist && \ echo "export TERM=dumb" | tee -a ~/.bashrc @@ -78,6 +77,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["su-exec", "openhab", "./start.sh"] diff --git a/1.8.3/armhf/alpine/entrypoint.sh b/1.8.3/armhf/alpine/entrypoint.sh index 0dcd9a2..f963f23 100644 --- a/1.8.3/armhf/alpine/entrypoint.sh +++ b/1.8.3/armhf/alpine/entrypoint.sh @@ -2,10 +2,6 @@ set -euo pipefail IFS=$'\n\t' -# Deleting instance.properties to avoid karaf PID conflict on restart -# See: https://github.com/openhab/openhab-docker/issues/99 -rm -f /openhab/runtime/instances/instance.properties - # Add openhab user & handle possible device groups for different host systems # Container base image puts dialout on group id 20, uucp on id 10 # GPIO Group for RPI access diff --git a/1.8.3/armhf/debian/Dockerfile b/1.8.3/armhf/debian/Dockerfile index b10935f..4df8880 100644 --- a/1.8.3/armhf/debian/Dockerfile +++ b/1.8.3/armhf/debian/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -44,42 +48,44 @@ ENV \ # Install basepackages RUN apt-get update && \ -apt-get install --no-install-recommends -y \ -ca-certificates \ -fontconfig \ -locales \ -locales-all \ -libpcap-dev \ -netbase \ -unzip \ -wget \ -&& rm -rf /var/lib/apt/lists/* + apt-get install --no-install-recommends -y \ + ca-certificates \ + fontconfig \ + locales \ + locales-all \ + libpcap-dev \ + netbase \ + unzip \ + wget && \ + rm -rf /var/lib/apt/lists/* ENV DEBIAN_FRONTEND=noninteractive # Install java ENV JAVA_HOME='/usr/lib/java-8' -RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} &&\ +RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} && \ mkdir ${JAVA_HOME} && \ tar -xvf /tmp/java.tar.gz --strip-components=1 -C ${JAVA_HOME} && \ + rm /tmp/java.tar.gz && \ update-alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 50 && \ update-alternatives --install /usr/bin/javac javac ${JAVA_HOME}/bin/javac 50 # Install gosu ENV GOSU_VERSION 1.10 RUN set -x \ -&& dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ -&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ +&& GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu # Install openhab -RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} &&\ - unzip -q /tmp/openhab.zip -d ${APPDIR} &&\ - rm /tmp/openhab.zip &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ cp -a ${APPDIR}/configurations ${APPDIR}/configurations.dist && \ echo "export TERM=dumb" | tee -a ~/.bashrc @@ -92,6 +98,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["gosu", "openhab", "./start.sh"] diff --git a/1.8.3/i386/alpine/Dockerfile b/1.8.3/i386/alpine/Dockerfile index 09c4438..e3d84ef 100644 --- a/1.8.3/i386/alpine/Dockerfile +++ b/1.8.3/i386/alpine/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -43,29 +47,24 @@ ENV \ LANGUAGE=en_US.UTF-8 # Install basepackages -RUN apk update && \ -apk add \ -ca-certificates \ -fontconfig \ -ttf-dejavu \ -libpcap-dev \ -unzip \ -dpkg \ -gnupg \ -wget \ -bash \ -shadow - - # Install java -RUN apk add openjdk8 - - # Install su-exec -RUN apk add su-exec +RUN apk update && apk add \ + ca-certificates \ + fontconfig \ + libpcap-dev \ + unzip \ + dpkg \ + gnupg \ + wget \ + bash \ + shadow \ + openjdk8 \ + su-exec && \ + rm -rf /var/cache/apk/* # Install openhab -RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} &&\ - unzip -q /tmp/openhab.zip -d ${APPDIR} &&\ - rm /tmp/openhab.zip &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ cp -a ${APPDIR}/configurations ${APPDIR}/configurations.dist && \ echo "export TERM=dumb" | tee -a ~/.bashrc @@ -78,6 +77,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["su-exec", "openhab", "./start.sh"] diff --git a/1.8.3/i386/alpine/entrypoint.sh b/1.8.3/i386/alpine/entrypoint.sh index 0dcd9a2..f963f23 100644 --- a/1.8.3/i386/alpine/entrypoint.sh +++ b/1.8.3/i386/alpine/entrypoint.sh @@ -2,10 +2,6 @@ set -euo pipefail IFS=$'\n\t' -# Deleting instance.properties to avoid karaf PID conflict on restart -# See: https://github.com/openhab/openhab-docker/issues/99 -rm -f /openhab/runtime/instances/instance.properties - # Add openhab user & handle possible device groups for different host systems # Container base image puts dialout on group id 20, uucp on id 10 # GPIO Group for RPI access diff --git a/1.8.3/i386/debian/Dockerfile b/1.8.3/i386/debian/Dockerfile index 7b40649..06b5fce 100644 --- a/1.8.3/i386/debian/Dockerfile +++ b/1.8.3/i386/debian/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -44,42 +48,44 @@ ENV \ # Install basepackages RUN apt-get update && \ -apt-get install --no-install-recommends -y \ -ca-certificates \ -fontconfig \ -locales \ -locales-all \ -libpcap-dev \ -netbase \ -unzip \ -wget \ -&& rm -rf /var/lib/apt/lists/* + apt-get install --no-install-recommends -y \ + ca-certificates \ + fontconfig \ + locales \ + locales-all \ + libpcap-dev \ + netbase \ + unzip \ + wget && \ + rm -rf /var/lib/apt/lists/* ENV DEBIAN_FRONTEND=noninteractive # Install java ENV JAVA_HOME='/usr/lib/java-8' -RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} &&\ +RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} && \ mkdir ${JAVA_HOME} && \ tar -xvf /tmp/java.tar.gz --strip-components=1 -C ${JAVA_HOME} && \ + rm /tmp/java.tar.gz && \ update-alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 50 && \ update-alternatives --install /usr/bin/javac javac ${JAVA_HOME}/bin/javac 50 # Install gosu ENV GOSU_VERSION 1.10 RUN set -x \ -&& dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ -&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ +&& GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ && chmod +x /usr/local/bin/gosu # Install openhab -RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} &&\ - unzip -q /tmp/openhab.zip -d ${APPDIR} &&\ - rm /tmp/openhab.zip &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ cp -a ${APPDIR}/configurations ${APPDIR}/configurations.dist && \ echo "export TERM=dumb" | tee -a ~/.bashrc @@ -92,6 +98,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["gosu", "openhab", "./start.sh"] diff --git a/2.0.0/amd64/alpine/Dockerfile b/2.0.0/amd64/alpine/Dockerfile index f67aebd..90641ff 100644 --- a/2.0.0/amd64/alpine/Dockerfile +++ b/2.0.0/amd64/alpine/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -43,31 +47,26 @@ ENV \ LANGUAGE=en_US.UTF-8 # Install basepackages -RUN apk update && \ -apk add \ -ca-certificates \ -fontconfig \ -ttf-dejavu \ -libpcap-dev \ -unzip \ -dpkg \ -gnupg \ -wget \ -bash \ -shadow - - # Install java -RUN apk add openjdk8 - - # Install su-exec -RUN apk add su-exec +RUN apk update && apk add \ + ca-certificates \ + fontconfig \ + libpcap-dev \ + unzip \ + dpkg \ + gnupg \ + wget \ + bash \ + shadow \ + openjdk8 \ + su-exec && \ + rm -rf /var/cache/apk/* # 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -82,6 +81,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["su-exec", "openhab", "./start.sh"] diff --git a/2.0.0/amd64/debian/Dockerfile b/2.0.0/amd64/debian/Dockerfile index b1b6e4d..10d3987 100644 --- a/2.0.0/amd64/debian/Dockerfile +++ b/2.0.0/amd64/debian/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -44,33 +48,35 @@ ENV \ # Install basepackages RUN apt-get update && \ -apt-get install --no-install-recommends -y \ -ca-certificates \ -fontconfig \ -locales \ -locales-all \ -libpcap-dev \ -netbase \ -unzip \ -wget \ -&& rm -rf /var/lib/apt/lists/* + apt-get install --no-install-recommends -y \ + ca-certificates \ + fontconfig \ + locales \ + locales-all \ + libpcap-dev \ + netbase \ + unzip \ + wget && \ + rm -rf /var/lib/apt/lists/* ENV DEBIAN_FRONTEND=noninteractive # Install java ENV JAVA_HOME='/usr/lib/java-8' -RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} &&\ +RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} && \ mkdir ${JAVA_HOME} && \ tar -xvf /tmp/java.tar.gz --strip-components=1 -C ${JAVA_HOME} && \ + rm /tmp/java.tar.gz && \ update-alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 50 && \ update-alternatives --install /usr/bin/javac javac ${JAVA_HOME}/bin/javac 50 # Install gosu ENV GOSU_VERSION 1.10 RUN set -x \ -&& dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ -&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ +&& GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ @@ -78,10 +84,10 @@ RUN set -x \ # 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -96,6 +102,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["gosu", "openhab", "./start.sh"] diff --git a/2.0.0/arm64/alpine/Dockerfile b/2.0.0/arm64/alpine/Dockerfile index 90175e8..56da38c 100644 --- a/2.0.0/arm64/alpine/Dockerfile +++ b/2.0.0/arm64/alpine/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -43,31 +47,26 @@ ENV \ LANGUAGE=en_US.UTF-8 # Install basepackages -RUN apk update && \ -apk add \ -ca-certificates \ -fontconfig \ -ttf-dejavu \ -libpcap-dev \ -unzip \ -dpkg \ -gnupg \ -wget \ -bash \ -shadow - - # Install java -RUN apk add openjdk8 - - # Install su-exec -RUN apk add su-exec +RUN apk update && apk add \ + ca-certificates \ + fontconfig \ + libpcap-dev \ + unzip \ + dpkg \ + gnupg \ + wget \ + bash \ + shadow \ + openjdk8 \ + su-exec && \ + rm -rf /var/cache/apk/* # 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -82,6 +81,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["su-exec", "openhab", "./start.sh"] diff --git a/2.0.0/arm64/debian/Dockerfile b/2.0.0/arm64/debian/Dockerfile index 67413a7..2139ded 100644 --- a/2.0.0/arm64/debian/Dockerfile +++ b/2.0.0/arm64/debian/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -44,33 +48,35 @@ ENV \ # Install basepackages RUN apt-get update && \ -apt-get install --no-install-recommends -y \ -ca-certificates \ -fontconfig \ -locales \ -locales-all \ -libpcap-dev \ -netbase \ -unzip \ -wget \ -&& rm -rf /var/lib/apt/lists/* + apt-get install --no-install-recommends -y \ + ca-certificates \ + fontconfig \ + locales \ + locales-all \ + libpcap-dev \ + netbase \ + unzip \ + wget && \ + rm -rf /var/lib/apt/lists/* ENV DEBIAN_FRONTEND=noninteractive # Install java ENV JAVA_HOME='/usr/lib/java-8' -RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} &&\ +RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} && \ mkdir ${JAVA_HOME} && \ tar -xvf /tmp/java.tar.gz --strip-components=1 -C ${JAVA_HOME} && \ + rm /tmp/java.tar.gz && \ update-alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 50 && \ update-alternatives --install /usr/bin/javac javac ${JAVA_HOME}/bin/javac 50 # Install gosu ENV GOSU_VERSION 1.10 RUN set -x \ -&& dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ -&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ +&& GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ @@ -79,15 +85,15 @@ RUN set -x \ RUN dpkg --add-architecture armhf && \ apt-get update && \ apt-get install --no-install-recommends -y \ - libc6:armhf \ - && rm -rf /var/lib/apt/lists/* + libc6:armhf && \ + 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -102,6 +108,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["gosu", "openhab", "./start.sh"] diff --git a/2.0.0/armhf/alpine/Dockerfile b/2.0.0/armhf/alpine/Dockerfile index 45ec0df..a087e47 100644 --- a/2.0.0/armhf/alpine/Dockerfile +++ b/2.0.0/armhf/alpine/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -43,31 +47,26 @@ ENV \ LANGUAGE=en_US.UTF-8 # Install basepackages -RUN apk update && \ -apk add \ -ca-certificates \ -fontconfig \ -ttf-dejavu \ -libpcap-dev \ -unzip \ -dpkg \ -gnupg \ -wget \ -bash \ -shadow - - # Install java -RUN apk add openjdk8 - - # Install su-exec -RUN apk add su-exec +RUN apk update && apk add \ + ca-certificates \ + fontconfig \ + libpcap-dev \ + unzip \ + dpkg \ + gnupg \ + wget \ + bash \ + shadow \ + openjdk8 \ + su-exec && \ + rm -rf /var/cache/apk/* # 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -82,6 +81,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["su-exec", "openhab", "./start.sh"] diff --git a/2.0.0/armhf/debian/Dockerfile b/2.0.0/armhf/debian/Dockerfile index 9cf6fef..00d4bff 100644 --- a/2.0.0/armhf/debian/Dockerfile +++ b/2.0.0/armhf/debian/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -44,33 +48,35 @@ ENV \ # Install basepackages RUN apt-get update && \ -apt-get install --no-install-recommends -y \ -ca-certificates \ -fontconfig \ -locales \ -locales-all \ -libpcap-dev \ -netbase \ -unzip \ -wget \ -&& rm -rf /var/lib/apt/lists/* + apt-get install --no-install-recommends -y \ + ca-certificates \ + fontconfig \ + locales \ + locales-all \ + libpcap-dev \ + netbase \ + unzip \ + wget && \ + rm -rf /var/lib/apt/lists/* ENV DEBIAN_FRONTEND=noninteractive # Install java ENV JAVA_HOME='/usr/lib/java-8' -RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} &&\ +RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} && \ mkdir ${JAVA_HOME} && \ tar -xvf /tmp/java.tar.gz --strip-components=1 -C ${JAVA_HOME} && \ + rm /tmp/java.tar.gz && \ update-alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 50 && \ update-alternatives --install /usr/bin/javac javac ${JAVA_HOME}/bin/javac 50 # Install gosu ENV GOSU_VERSION 1.10 RUN set -x \ -&& dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ -&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ +&& GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ @@ -78,10 +84,10 @@ RUN set -x \ # 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -96,6 +102,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["gosu", "openhab", "./start.sh"] diff --git a/2.0.0/i386/alpine/Dockerfile b/2.0.0/i386/alpine/Dockerfile index d148720..a5203f5 100644 --- a/2.0.0/i386/alpine/Dockerfile +++ b/2.0.0/i386/alpine/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -43,31 +47,26 @@ ENV \ LANGUAGE=en_US.UTF-8 # Install basepackages -RUN apk update && \ -apk add \ -ca-certificates \ -fontconfig \ -ttf-dejavu \ -libpcap-dev \ -unzip \ -dpkg \ -gnupg \ -wget \ -bash \ -shadow - - # Install java -RUN apk add openjdk8 - - # Install su-exec -RUN apk add su-exec +RUN apk update && apk add \ + ca-certificates \ + fontconfig \ + libpcap-dev \ + unzip \ + dpkg \ + gnupg \ + wget \ + bash \ + shadow \ + openjdk8 \ + su-exec && \ + rm -rf /var/cache/apk/* # 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -82,6 +81,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["su-exec", "openhab", "./start.sh"] diff --git a/2.0.0/i386/debian/Dockerfile b/2.0.0/i386/debian/Dockerfile index 54ec22a..f8989da 100644 --- a/2.0.0/i386/debian/Dockerfile +++ b/2.0.0/i386/debian/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -44,33 +48,35 @@ ENV \ # Install basepackages RUN apt-get update && \ -apt-get install --no-install-recommends -y \ -ca-certificates \ -fontconfig \ -locales \ -locales-all \ -libpcap-dev \ -netbase \ -unzip \ -wget \ -&& rm -rf /var/lib/apt/lists/* + apt-get install --no-install-recommends -y \ + ca-certificates \ + fontconfig \ + locales \ + locales-all \ + libpcap-dev \ + netbase \ + unzip \ + wget && \ + rm -rf /var/lib/apt/lists/* ENV DEBIAN_FRONTEND=noninteractive # Install java ENV JAVA_HOME='/usr/lib/java-8' -RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} &&\ +RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} && \ mkdir ${JAVA_HOME} && \ tar -xvf /tmp/java.tar.gz --strip-components=1 -C ${JAVA_HOME} && \ + rm /tmp/java.tar.gz && \ update-alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 50 && \ update-alternatives --install /usr/bin/javac javac ${JAVA_HOME}/bin/javac 50 # Install gosu ENV GOSU_VERSION 1.10 RUN set -x \ -&& dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ -&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ +&& GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ @@ -78,10 +84,10 @@ RUN set -x \ # 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -96,6 +102,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["gosu", "openhab", "./start.sh"] diff --git a/2.1.0/amd64/alpine/Dockerfile b/2.1.0/amd64/alpine/Dockerfile index 62b0d5e..4011e3c 100644 --- a/2.1.0/amd64/alpine/Dockerfile +++ b/2.1.0/amd64/alpine/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -43,31 +47,26 @@ ENV \ LANGUAGE=en_US.UTF-8 # Install basepackages -RUN apk update && \ -apk add \ -ca-certificates \ -fontconfig \ -ttf-dejavu \ -libpcap-dev \ -unzip \ -dpkg \ -gnupg \ -wget \ -bash \ -shadow - - # Install java -RUN apk add openjdk8 - - # Install su-exec -RUN apk add su-exec +RUN apk update && apk add \ + ca-certificates \ + fontconfig \ + libpcap-dev \ + unzip \ + dpkg \ + gnupg \ + wget \ + bash \ + shadow \ + openjdk8 \ + su-exec && \ + rm -rf /var/cache/apk/* # 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -82,6 +81,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["su-exec", "openhab", "./start.sh"] diff --git a/2.1.0/amd64/debian/Dockerfile b/2.1.0/amd64/debian/Dockerfile index 962c680..2dbf12e 100644 --- a/2.1.0/amd64/debian/Dockerfile +++ b/2.1.0/amd64/debian/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -44,33 +48,35 @@ ENV \ # Install basepackages RUN apt-get update && \ -apt-get install --no-install-recommends -y \ -ca-certificates \ -fontconfig \ -locales \ -locales-all \ -libpcap-dev \ -netbase \ -unzip \ -wget \ -&& rm -rf /var/lib/apt/lists/* + apt-get install --no-install-recommends -y \ + ca-certificates \ + fontconfig \ + locales \ + locales-all \ + libpcap-dev \ + netbase \ + unzip \ + wget && \ + rm -rf /var/lib/apt/lists/* ENV DEBIAN_FRONTEND=noninteractive # Install java ENV JAVA_HOME='/usr/lib/java-8' -RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} &&\ +RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} && \ mkdir ${JAVA_HOME} && \ tar -xvf /tmp/java.tar.gz --strip-components=1 -C ${JAVA_HOME} && \ + rm /tmp/java.tar.gz && \ update-alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 50 && \ update-alternatives --install /usr/bin/javac javac ${JAVA_HOME}/bin/javac 50 # Install gosu ENV GOSU_VERSION 1.10 RUN set -x \ -&& dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ -&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ +&& GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ @@ -78,10 +84,10 @@ RUN set -x \ # 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -96,6 +102,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["gosu", "openhab", "./start.sh"] diff --git a/2.1.0/arm64/alpine/Dockerfile b/2.1.0/arm64/alpine/Dockerfile index 64e0b66..b60c9ed 100644 --- a/2.1.0/arm64/alpine/Dockerfile +++ b/2.1.0/arm64/alpine/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -43,31 +47,26 @@ ENV \ LANGUAGE=en_US.UTF-8 # Install basepackages -RUN apk update && \ -apk add \ -ca-certificates \ -fontconfig \ -ttf-dejavu \ -libpcap-dev \ -unzip \ -dpkg \ -gnupg \ -wget \ -bash \ -shadow - - # Install java -RUN apk add openjdk8 - - # Install su-exec -RUN apk add su-exec +RUN apk update && apk add \ + ca-certificates \ + fontconfig \ + libpcap-dev \ + unzip \ + dpkg \ + gnupg \ + wget \ + bash \ + shadow \ + openjdk8 \ + su-exec && \ + rm -rf /var/cache/apk/* # 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -82,6 +81,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["su-exec", "openhab", "./start.sh"] diff --git a/2.1.0/arm64/debian/Dockerfile b/2.1.0/arm64/debian/Dockerfile index b60ba40..102f01f 100644 --- a/2.1.0/arm64/debian/Dockerfile +++ b/2.1.0/arm64/debian/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -44,33 +48,35 @@ ENV \ # Install basepackages RUN apt-get update && \ -apt-get install --no-install-recommends -y \ -ca-certificates \ -fontconfig \ -locales \ -locales-all \ -libpcap-dev \ -netbase \ -unzip \ -wget \ -&& rm -rf /var/lib/apt/lists/* + apt-get install --no-install-recommends -y \ + ca-certificates \ + fontconfig \ + locales \ + locales-all \ + libpcap-dev \ + netbase \ + unzip \ + wget && \ + rm -rf /var/lib/apt/lists/* ENV DEBIAN_FRONTEND=noninteractive # Install java ENV JAVA_HOME='/usr/lib/java-8' -RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} &&\ +RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} && \ mkdir ${JAVA_HOME} && \ tar -xvf /tmp/java.tar.gz --strip-components=1 -C ${JAVA_HOME} && \ + rm /tmp/java.tar.gz && \ update-alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 50 && \ update-alternatives --install /usr/bin/javac javac ${JAVA_HOME}/bin/javac 50 # Install gosu ENV GOSU_VERSION 1.10 RUN set -x \ -&& dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ -&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ +&& GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ @@ -79,15 +85,15 @@ RUN set -x \ RUN dpkg --add-architecture armhf && \ apt-get update && \ apt-get install --no-install-recommends -y \ - libc6:armhf \ - && rm -rf /var/lib/apt/lists/* + libc6:armhf && \ + 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -102,6 +108,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["gosu", "openhab", "./start.sh"] diff --git a/2.1.0/armhf/alpine/Dockerfile b/2.1.0/armhf/alpine/Dockerfile index 480a6df..4595079 100644 --- a/2.1.0/armhf/alpine/Dockerfile +++ b/2.1.0/armhf/alpine/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -43,31 +47,26 @@ ENV \ LANGUAGE=en_US.UTF-8 # Install basepackages -RUN apk update && \ -apk add \ -ca-certificates \ -fontconfig \ -ttf-dejavu \ -libpcap-dev \ -unzip \ -dpkg \ -gnupg \ -wget \ -bash \ -shadow - - # Install java -RUN apk add openjdk8 - - # Install su-exec -RUN apk add su-exec +RUN apk update && apk add \ + ca-certificates \ + fontconfig \ + libpcap-dev \ + unzip \ + dpkg \ + gnupg \ + wget \ + bash \ + shadow \ + openjdk8 \ + su-exec && \ + rm -rf /var/cache/apk/* # 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -82,6 +81,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["su-exec", "openhab", "./start.sh"] diff --git a/2.1.0/armhf/debian/Dockerfile b/2.1.0/armhf/debian/Dockerfile index 29cf55b..d201cba 100644 --- a/2.1.0/armhf/debian/Dockerfile +++ b/2.1.0/armhf/debian/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -44,33 +48,35 @@ ENV \ # Install basepackages RUN apt-get update && \ -apt-get install --no-install-recommends -y \ -ca-certificates \ -fontconfig \ -locales \ -locales-all \ -libpcap-dev \ -netbase \ -unzip \ -wget \ -&& rm -rf /var/lib/apt/lists/* + apt-get install --no-install-recommends -y \ + ca-certificates \ + fontconfig \ + locales \ + locales-all \ + libpcap-dev \ + netbase \ + unzip \ + wget && \ + rm -rf /var/lib/apt/lists/* ENV DEBIAN_FRONTEND=noninteractive # Install java ENV JAVA_HOME='/usr/lib/java-8' -RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} &&\ +RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} && \ mkdir ${JAVA_HOME} && \ tar -xvf /tmp/java.tar.gz --strip-components=1 -C ${JAVA_HOME} && \ + rm /tmp/java.tar.gz && \ update-alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 50 && \ update-alternatives --install /usr/bin/javac javac ${JAVA_HOME}/bin/javac 50 # Install gosu ENV GOSU_VERSION 1.10 RUN set -x \ -&& dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ -&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ +&& GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ @@ -78,10 +84,10 @@ RUN set -x \ # 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -96,6 +102,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["gosu", "openhab", "./start.sh"] diff --git a/2.1.0/i386/alpine/Dockerfile b/2.1.0/i386/alpine/Dockerfile index fccf0b1..f84ee21 100644 --- a/2.1.0/i386/alpine/Dockerfile +++ b/2.1.0/i386/alpine/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -43,31 +47,26 @@ ENV \ LANGUAGE=en_US.UTF-8 # Install basepackages -RUN apk update && \ -apk add \ -ca-certificates \ -fontconfig \ -ttf-dejavu \ -libpcap-dev \ -unzip \ -dpkg \ -gnupg \ -wget \ -bash \ -shadow - - # Install java -RUN apk add openjdk8 - - # Install su-exec -RUN apk add su-exec +RUN apk update && apk add \ + ca-certificates \ + fontconfig \ + libpcap-dev \ + unzip \ + dpkg \ + gnupg \ + wget \ + bash \ + shadow \ + openjdk8 \ + su-exec && \ + rm -rf /var/cache/apk/* # 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -82,6 +81,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["su-exec", "openhab", "./start.sh"] diff --git a/2.1.0/i386/debian/Dockerfile b/2.1.0/i386/debian/Dockerfile index 89b926a..26a1d56 100644 --- a/2.1.0/i386/debian/Dockerfile +++ b/2.1.0/i386/debian/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -44,33 +48,35 @@ ENV \ # Install basepackages RUN apt-get update && \ -apt-get install --no-install-recommends -y \ -ca-certificates \ -fontconfig \ -locales \ -locales-all \ -libpcap-dev \ -netbase \ -unzip \ -wget \ -&& rm -rf /var/lib/apt/lists/* + apt-get install --no-install-recommends -y \ + ca-certificates \ + fontconfig \ + locales \ + locales-all \ + libpcap-dev \ + netbase \ + unzip \ + wget && \ + rm -rf /var/lib/apt/lists/* ENV DEBIAN_FRONTEND=noninteractive # Install java ENV JAVA_HOME='/usr/lib/java-8' -RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} &&\ +RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} && \ mkdir ${JAVA_HOME} && \ tar -xvf /tmp/java.tar.gz --strip-components=1 -C ${JAVA_HOME} && \ + rm /tmp/java.tar.gz && \ update-alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 50 && \ update-alternatives --install /usr/bin/javac javac ${JAVA_HOME}/bin/javac 50 # Install gosu ENV GOSU_VERSION 1.10 RUN set -x \ -&& dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ -&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ +&& GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ @@ -78,10 +84,10 @@ RUN set -x \ # 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -96,6 +102,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["gosu", "openhab", "./start.sh"] diff --git a/2.2.0-snapshot/amd64/alpine/Dockerfile b/2.2.0-snapshot/amd64/alpine/Dockerfile index b23a864..1457337 100644 --- a/2.2.0-snapshot/amd64/alpine/Dockerfile +++ b/2.2.0-snapshot/amd64/alpine/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -43,31 +47,26 @@ ENV \ LANGUAGE=en_US.UTF-8 # Install basepackages -RUN apk update && \ -apk add \ -ca-certificates \ -fontconfig \ -ttf-dejavu \ -libpcap-dev \ -unzip \ -dpkg \ -gnupg \ -wget \ -bash \ -shadow - - # Install java -RUN apk add openjdk8 - - # Install su-exec -RUN apk add su-exec +RUN apk update && apk add \ + ca-certificates \ + fontconfig \ + libpcap-dev \ + unzip \ + dpkg \ + gnupg \ + wget \ + bash \ + shadow \ + openjdk8 \ + su-exec && \ + rm -rf /var/cache/apk/* # 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -82,6 +81,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["su-exec", "openhab", "./start.sh"] diff --git a/2.2.0-snapshot/amd64/debian/Dockerfile b/2.2.0-snapshot/amd64/debian/Dockerfile index e51b1e3..cb03cee 100644 --- a/2.2.0-snapshot/amd64/debian/Dockerfile +++ b/2.2.0-snapshot/amd64/debian/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -44,33 +48,35 @@ ENV \ # Install basepackages RUN apt-get update && \ -apt-get install --no-install-recommends -y \ -ca-certificates \ -fontconfig \ -locales \ -locales-all \ -libpcap-dev \ -netbase \ -unzip \ -wget \ -&& rm -rf /var/lib/apt/lists/* + apt-get install --no-install-recommends -y \ + ca-certificates \ + fontconfig \ + locales \ + locales-all \ + libpcap-dev \ + netbase \ + unzip \ + wget && \ + rm -rf /var/lib/apt/lists/* ENV DEBIAN_FRONTEND=noninteractive # Install java ENV JAVA_HOME='/usr/lib/java-8' -RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} &&\ +RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} && \ mkdir ${JAVA_HOME} && \ tar -xvf /tmp/java.tar.gz --strip-components=1 -C ${JAVA_HOME} && \ + rm /tmp/java.tar.gz && \ update-alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 50 && \ update-alternatives --install /usr/bin/javac javac ${JAVA_HOME}/bin/javac 50 # Install gosu ENV GOSU_VERSION 1.10 RUN set -x \ -&& dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ -&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ +&& GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ @@ -78,10 +84,10 @@ RUN set -x \ # 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -96,6 +102,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["gosu", "openhab", "./start.sh"] diff --git a/2.2.0-snapshot/arm64/alpine/Dockerfile b/2.2.0-snapshot/arm64/alpine/Dockerfile index fef2098..7bfffa0 100644 --- a/2.2.0-snapshot/arm64/alpine/Dockerfile +++ b/2.2.0-snapshot/arm64/alpine/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -43,31 +47,26 @@ ENV \ LANGUAGE=en_US.UTF-8 # Install basepackages -RUN apk update && \ -apk add \ -ca-certificates \ -fontconfig \ -ttf-dejavu \ -libpcap-dev \ -unzip \ -dpkg \ -gnupg \ -wget \ -bash \ -shadow - - # Install java -RUN apk add openjdk8 - - # Install su-exec -RUN apk add su-exec +RUN apk update && apk add \ + ca-certificates \ + fontconfig \ + libpcap-dev \ + unzip \ + dpkg \ + gnupg \ + wget \ + bash \ + shadow \ + openjdk8 \ + su-exec && \ + rm -rf /var/cache/apk/* # 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -82,6 +81,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["su-exec", "openhab", "./start.sh"] diff --git a/2.2.0-snapshot/arm64/debian/Dockerfile b/2.2.0-snapshot/arm64/debian/Dockerfile index 0017aa3..a5a4922 100644 --- a/2.2.0-snapshot/arm64/debian/Dockerfile +++ b/2.2.0-snapshot/arm64/debian/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -44,33 +48,35 @@ ENV \ # Install basepackages RUN apt-get update && \ -apt-get install --no-install-recommends -y \ -ca-certificates \ -fontconfig \ -locales \ -locales-all \ -libpcap-dev \ -netbase \ -unzip \ -wget \ -&& rm -rf /var/lib/apt/lists/* + apt-get install --no-install-recommends -y \ + ca-certificates \ + fontconfig \ + locales \ + locales-all \ + libpcap-dev \ + netbase \ + unzip \ + wget && \ + rm -rf /var/lib/apt/lists/* ENV DEBIAN_FRONTEND=noninteractive # Install java ENV JAVA_HOME='/usr/lib/java-8' -RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} &&\ +RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} && \ mkdir ${JAVA_HOME} && \ tar -xvf /tmp/java.tar.gz --strip-components=1 -C ${JAVA_HOME} && \ + rm /tmp/java.tar.gz && \ update-alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 50 && \ update-alternatives --install /usr/bin/javac javac ${JAVA_HOME}/bin/javac 50 # Install gosu ENV GOSU_VERSION 1.10 RUN set -x \ -&& dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ -&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ +&& GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ @@ -79,15 +85,15 @@ RUN set -x \ RUN dpkg --add-architecture armhf && \ apt-get update && \ apt-get install --no-install-recommends -y \ - libc6:armhf \ - && rm -rf /var/lib/apt/lists/* + libc6:armhf && \ + 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -102,6 +108,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["gosu", "openhab", "./start.sh"] diff --git a/2.2.0-snapshot/armhf/alpine/Dockerfile b/2.2.0-snapshot/armhf/alpine/Dockerfile index dd3850f..3f58a99 100644 --- a/2.2.0-snapshot/armhf/alpine/Dockerfile +++ b/2.2.0-snapshot/armhf/alpine/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -43,31 +47,26 @@ ENV \ LANGUAGE=en_US.UTF-8 # Install basepackages -RUN apk update && \ -apk add \ -ca-certificates \ -fontconfig \ -ttf-dejavu \ -libpcap-dev \ -unzip \ -dpkg \ -gnupg \ -wget \ -bash \ -shadow - - # Install java -RUN apk add openjdk8 - - # Install su-exec -RUN apk add su-exec +RUN apk update && apk add \ + ca-certificates \ + fontconfig \ + libpcap-dev \ + unzip \ + dpkg \ + gnupg \ + wget \ + bash \ + shadow \ + openjdk8 \ + su-exec && \ + rm -rf /var/cache/apk/* # 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -82,6 +81,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["su-exec", "openhab", "./start.sh"] diff --git a/2.2.0-snapshot/armhf/debian/Dockerfile b/2.2.0-snapshot/armhf/debian/Dockerfile index 3a2c596..084d264 100644 --- a/2.2.0-snapshot/armhf/debian/Dockerfile +++ b/2.2.0-snapshot/armhf/debian/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -44,33 +48,35 @@ ENV \ # Install basepackages RUN apt-get update && \ -apt-get install --no-install-recommends -y \ -ca-certificates \ -fontconfig \ -locales \ -locales-all \ -libpcap-dev \ -netbase \ -unzip \ -wget \ -&& rm -rf /var/lib/apt/lists/* + apt-get install --no-install-recommends -y \ + ca-certificates \ + fontconfig \ + locales \ + locales-all \ + libpcap-dev \ + netbase \ + unzip \ + wget && \ + rm -rf /var/lib/apt/lists/* ENV DEBIAN_FRONTEND=noninteractive # Install java ENV JAVA_HOME='/usr/lib/java-8' -RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} &&\ +RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} && \ mkdir ${JAVA_HOME} && \ tar -xvf /tmp/java.tar.gz --strip-components=1 -C ${JAVA_HOME} && \ + rm /tmp/java.tar.gz && \ update-alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 50 && \ update-alternatives --install /usr/bin/javac javac ${JAVA_HOME}/bin/javac 50 # Install gosu ENV GOSU_VERSION 1.10 RUN set -x \ -&& dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ -&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ +&& GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ @@ -78,10 +84,10 @@ RUN set -x \ # 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -96,6 +102,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["gosu", "openhab", "./start.sh"] diff --git a/2.2.0-snapshot/i386/alpine/Dockerfile b/2.2.0-snapshot/i386/alpine/Dockerfile index ed8e574..1ea46ec 100644 --- a/2.2.0-snapshot/i386/alpine/Dockerfile +++ b/2.2.0-snapshot/i386/alpine/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -43,31 +47,26 @@ ENV \ LANGUAGE=en_US.UTF-8 # Install basepackages -RUN apk update && \ -apk add \ -ca-certificates \ -fontconfig \ -ttf-dejavu \ -libpcap-dev \ -unzip \ -dpkg \ -gnupg \ -wget \ -bash \ -shadow - - # Install java -RUN apk add openjdk8 - - # Install su-exec -RUN apk add su-exec +RUN apk update && apk add \ + ca-certificates \ + fontconfig \ + libpcap-dev \ + unzip \ + dpkg \ + gnupg \ + wget \ + bash \ + shadow \ + openjdk8 \ + su-exec && \ + rm -rf /var/cache/apk/* # 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -82,6 +81,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["su-exec", "openhab", "./start.sh"] diff --git a/2.2.0-snapshot/i386/debian/Dockerfile b/2.2.0-snapshot/i386/debian/Dockerfile index 2cca542..845406e 100644 --- a/2.2.0-snapshot/i386/debian/Dockerfile +++ b/2.2.0-snapshot/i386/debian/Dockerfile @@ -26,15 +26,19 @@ ENV \ # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF +ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ -maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -44,33 +48,35 @@ ENV \ # Install basepackages RUN apt-get update && \ -apt-get install --no-install-recommends -y \ -ca-certificates \ -fontconfig \ -locales \ -locales-all \ -libpcap-dev \ -netbase \ -unzip \ -wget \ -&& rm -rf /var/lib/apt/lists/* + apt-get install --no-install-recommends -y \ + ca-certificates \ + fontconfig \ + locales \ + locales-all \ + libpcap-dev \ + netbase \ + unzip \ + wget && \ + rm -rf /var/lib/apt/lists/* ENV DEBIAN_FRONTEND=noninteractive # Install java ENV JAVA_HOME='/usr/lib/java-8' -RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} &&\ +RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} && \ mkdir ${JAVA_HOME} && \ tar -xvf /tmp/java.tar.gz --strip-components=1 -C ${JAVA_HOME} && \ + rm /tmp/java.tar.gz && \ update-alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 50 && \ update-alternatives --install /usr/bin/javac javac ${JAVA_HOME}/bin/javac 50 # Install gosu ENV GOSU_VERSION 1.10 RUN set -x \ -&& dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ -&& wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ +&& GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ @@ -78,10 +84,10 @@ RUN set -x \ # 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ +RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -96,6 +102,6 @@ EXPOSE 8080 8443 5555 COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] -# Execute command +# Execute command CMD ["gosu", "openhab", "./start.sh"] diff --git a/update.sh b/update.sh index 65c64b5..db563cb 100755 --- a/update.sh +++ b/update.sh @@ -94,15 +94,19 @@ print_basemetadata() { # Basic build-time metadata as defined at http://label-schema.org ARG BUILD_DATE ARG VCS_REF + ARG VERSION LABEL org.label-schema.build-date=$BUILD_DATE \ org.label-schema.docker.dockerfile="/Dockerfile" \ org.label-schema.license="EPL" \ org.label-schema.name="openHAB" \ + org.label-schema.vendor="penHAB Foundation e.V." \ + org.label-schema.version=$VERSION \ + org.label-schema.description="An open source, technology agnostic home automation platform" \ org.label-schema.url="http://www.openhab.com/" \ org.label-schema.vcs-ref=$VCS_REF \ org.label-schema.vcs-type="Git" \ org.label-schema.vcs-url="https://github.com/openhab/openhab-docker.git" \ - maintainer="openHAB " + maintainer="openHAB " # Set locales ENV \ @@ -118,16 +122,16 @@ print_basepackages() { cat >> $1 <<-'EOI' # Install basepackages RUN apt-get update && \ - apt-get install --no-install-recommends -y \ - ca-certificates \ - fontconfig \ - locales \ - locales-all \ - libpcap-dev \ - netbase \ - unzip \ - wget \ - && rm -rf /var/lib/apt/lists/* + apt-get install --no-install-recommends -y \ + ca-certificates \ + fontconfig \ + locales \ + locales-all \ + libpcap-dev \ + netbase \ + unzip \ + wget && \ + rm -rf /var/lib/apt/lists/* ENV DEBIAN_FRONTEND=noninteractive EOI @@ -137,18 +141,19 @@ EOI print_basepackages_alpine() { cat >> $1 <<-'EOI' # Install basepackages - RUN apk update && \ - apk add \ - ca-certificates \ - fontconfig \ - ttf-dejavu \ - libpcap-dev \ - unzip \ - dpkg \ - gnupg \ - wget \ - bash \ - shadow + RUN apk update && apk add \ + ca-certificates \ + fontconfig \ + libpcap-dev \ + unzip \ + dpkg \ + gnupg \ + wget \ + bash \ + shadow \ + openjdk8 \ + su-exec && \ + rm -rf /var/cache/apk/* EOI } @@ -159,8 +164,8 @@ print_lib32_support_arm64() { RUN dpkg --add-architecture armhf && \ apt-get update && \ apt-get install --no-install-recommends -y \ - libc6:armhf \ - && rm -rf /var/lib/apt/lists/* + libc6:armhf && \ + rm -rf /var/lib/apt/lists/* EOI } @@ -171,10 +176,11 @@ print_gosu() { # Install gosu ENV GOSU_VERSION 1.10 RUN set -x \ - && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ - && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ + && dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')" \ + && wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch" \ && wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc" \ - && export GNUPGHOME="$(mktemp -d)" \ + && export GNUPGHOME \ + && GNUPGHOME="$(mktemp -d)" \ && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4 \ && gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu \ && rm -r "$GNUPGHOME" /usr/local/bin/gosu.asc \ @@ -183,47 +189,30 @@ print_gosu() { EOI } -# Install su-exec -print_su-exec() { - cat >> $1 <<-'EOI' - # Install su-exec - RUN apk add su-exec - -EOI -} - # Install java for debian print_java() { cat >> $1 <<-'EOI' # Install java ENV JAVA_HOME='/usr/lib/java-8' - RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} &&\ + RUN wget -nv -O /tmp/java.tar.gz ${JAVA_URL} && \ mkdir ${JAVA_HOME} && \ tar -xvf /tmp/java.tar.gz --strip-components=1 -C ${JAVA_HOME} && \ + rm /tmp/java.tar.gz && \ update-alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 50 && \ update-alternatives --install /usr/bin/javac javac ${JAVA_HOME}/bin/javac 50 EOI } -# Install java for alpine -print_java_alpine() { - cat >> $1 <<-'EOI' - # Install java - RUN apk add openjdk8 - -EOI -} - # Install openhab for 2.0.0 and newer print_openhab_install() { cat >> $1 <<-'EOI' # 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} &&\ - rm /tmp/openhab.zip &&\ - mkdir -p ${APPDIR}/userdata/logs &&\ + RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ + mkdir -p ${APPDIR}/userdata/logs && \ touch ${APPDIR}/userdata/logs/openhab.log && \ cp -a ${APPDIR}/userdata ${APPDIR}/userdata.dist && \ cp -a ${APPDIR}/conf ${APPDIR}/conf.dist && \ @@ -236,9 +225,9 @@ EOI print_openhab_install_old() { cat >> $1 <<-'EOI' # Install openhab - RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} &&\ - unzip -q /tmp/openhab.zip -d ${APPDIR} &&\ - rm /tmp/openhab.zip &&\ + RUN wget -nv -O /tmp/openhab.zip ${OPENHAB_URL} && \ + unzip -q /tmp/openhab.zip -d ${APPDIR} && \ + rm /tmp/openhab.zip && \ cp -a ${APPDIR}/configurations ${APPDIR}/configurations.dist && \ echo "export TERM=dumb" | tee -a ~/.bashrc @@ -272,8 +261,8 @@ print_entrypoint() { COPY entrypoint.sh / RUN chmod +x /entrypoint.sh ENTRYPOINT ["/entrypoint.sh"] - # Execute command + # Execute command EOI } @@ -313,8 +302,6 @@ do print_basemetadata $file; if [ "$base" == "alpine" ]; then print_basepackages_alpine $file; - print_java_alpine $file; - print_su-exec $file; else print_basepackages $file; print_java $file; @@ -339,7 +326,7 @@ do # remove bug fix for version 2 from entrypoint_alpine.sh if [ "$version" == "1.8.3" ]; then line=$(sed "/rm -f \/openhab\/userdata\/tmp\/instances\/instance.properties/=; d" entrypoint_alpine.sh) - sed -i "$((line-3)),${line}"d $dstFile + sed -i "$((line-7)),${line}"d $dstFile fi else cp entrypoint_debian.sh $dstFile