From 2a7f989be09d140fe313366214ecb65d404c8442 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Wed, 20 Jan 2021 19:10:22 +0100 Subject: [PATCH] Align with community addon --- bitwarden/Dockerfile | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/bitwarden/Dockerfile b/bitwarden/Dockerfile index b93c5f40b..ef450b032 100644 --- a/bitwarden/Dockerfile +++ b/bitwarden/Dockerfile @@ -12,7 +12,7 @@ FROM "bitwardenrs/server:${BUILD_VERSION}" as bitwarden ############################################################################### # hadolint ignore=DL3006 FROM ${BUILD_FROM} - + # Set shell SHELL ["/bin/bash", "-o", "pipefail", "-c"] @@ -27,7 +27,10 @@ RUN \ apt-get update \ \ && apt-get install -y --no-install-recommends \ - nginx=1.14.2-2+deb10u3 libpq5 libmariadb3 \ + libmariadb-dev-compat=1:10.3.27-0+deb10u1 \ + libpq5=11.9-0+deb10u1 \ + nginx=1.14.2-2+deb10u3 \ + sqlite3=3.27.2-3+deb10u1 \ && apt-get clean \ && rm -f -r \ /etc/nginx \ @@ -37,3 +40,32 @@ RUN \ # Copy root filesystem COPY rootfs / + +# Build arguments +ARG BUILD_ARCH +ARG BUILD_DATE +ARG BUILD_DESCRIPTION +ARG BUILD_NAME +ARG BUILD_REF +ARG BUILD_REPOSITORY +ARG BUILD_VERSION + +# Labels +LABEL \ + io.hass.name="${BUILD_NAME}" \ + io.hass.description="${BUILD_DESCRIPTION}" \ + io.hass.arch="${BUILD_ARCH}" \ + io.hass.type="addon" \ + io.hass.version=${BUILD_VERSION} \ + maintainer="Franck Nijhof " \ + org.opencontainers.image.title="${BUILD_NAME}" \ + org.opencontainers.image.description="${BUILD_DESCRIPTION}" \ + org.opencontainers.image.vendor="Home Assistant Community Add-ons" \ + org.opencontainers.image.authors="Franck Nijhof " \ + org.opencontainers.image.licenses="MIT" \ + org.opencontainers.image.url="https://addons.community" \ + org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \ + org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \ + org.opencontainers.image.created=${BUILD_DATE} \ + org.opencontainers.image.revision=${BUILD_REF} \ + org.opencontainers.image.version=${BUILD_VERSION}