From e32047ffcce7b89c7456f61f846b88d2b4cd6eba Mon Sep 17 00:00:00 2001 From: Danil Titarenko <77471369+danilapog@users.noreply.github.com> Date: Tue, 11 Oct 2022 12:52:48 +0300 Subject: [PATCH] Fix bug #59310 / Fix users build (#508) * Remove version for correct users build * Assembly support without targetarch variable * Remove targetarch variable * Correcting a typo in a variable * Small fix Co-authored-by: Semyon Bezrukov --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 66a9137..7aa158a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -74,16 +74,16 @@ EXPOSE 80 443 ARG COMPANY_NAME=onlyoffice ARG PRODUCT_NAME=documentserver ARG PRODUCT_EDITION= -ARG PACKAGE_VERSION=0.0.0-0 +ARG PACKAGE_VERSION= ARG TARGETARCH ARG PACKAGE_BASEURL="http://download.onlyoffice.com/install/documentserver/linux" -ARG PACKAGE_FILE="${COMPANY_NAME}-${PRODUCT_NAME}${PRODUCT_EDITION}_${PACKAGE_VERSION}_${TARGETARCH}.deb" ENV COMPANY_NAME=$COMPANY_NAME \ PRODUCT_NAME=$PRODUCT_NAME \ PRODUCT_EDITION=$PRODUCT_EDITION -RUN wget -q -P /tmp "$PACKAGE_BASEURL/$PACKAGE_FILE" && \ +RUN PACKAGE_FILE="${COMPANY_NAME}-${PRODUCT_NAME}${PRODUCT_EDITION}${PACKAGE_VERSION:+_$PACKAGE_VERSION}_${TARGETARCH:-$(dpkg --print-architecture)}.deb" && \ + wget -q -P /tmp "$PACKAGE_BASEURL/$PACKAGE_FILE" && \ apt-get -y update && \ service postgresql start && \ apt-get -yq install /tmp/$PACKAGE_FILE && \