From a882c1887a5bce42a6642570cb58a93965217b5d Mon Sep 17 00:00:00 2001 From: Sergey Kirichenko Date: Thu, 3 Mar 2022 11:55:02 +0300 Subject: [PATCH] Add arm build config --- build/install/docker/Dockerfile.app | 10 ++++++---- build/install/docker/hooks/build | 4 +++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/build/install/docker/Dockerfile.app b/build/install/docker/Dockerfile.app index 231a521607..398b402838 100644 --- a/build/install/docker/Dockerfile.app +++ b/build/install/docker/Dockerfile.app @@ -1,10 +1,12 @@ ### STAGE 1: Base image ###### ARG SRC_PATH=/app/onlyoffice/src ARG BUILD_PATH=/var/www -ARG REPO_TAG=6.0 -ARG REPO=mcr.microsoft.com/dotnet/sdk +ARG REPO_SDK_TAG=6.0 +ARG REPO_SDK=mcr.microsoft.com/dotnet/sdk +ARG REPO_RUN_TAG=6.0 +ARG REPO_RUN=mcr.microsoft.com/dotnet/aspnet -FROM $REPO:$REPO_TAG AS base +FROM $REPO_SDK:$REPO_SDK_TAG AS base ARG RELEASE_DATE="2016-06-21" ARG DEBIAN_FRONTEND=noninteractive ARG PRODUCT_VERSION=0.0.0 @@ -67,7 +69,7 @@ COPY config/mysql/conf.d/mysql.cnf /etc/mysql/conf.d/mysql.cnf RUN rm -rf /var/lib/apt/lists/* ### STAGE 2: Build ### -FROM mcr.microsoft.com/dotnet/aspnet:6.0 as builder +FROM $REPO_RUN:$REPO_RUN_TAG as builder ARG BUILD_PATH ENV BUILD_PATH=${BUILD_PATH} diff --git a/build/install/docker/hooks/build b/build/install/docker/hooks/build index bc21f3759b..42922933aa 100644 --- a/build/install/docker/hooks/build +++ b/build/install/docker/hooks/build @@ -6,4 +6,6 @@ docker-compose -f build.yml build \ --build-arg PRODUCT_VERSION=$PRODUCT_VERSION \ --build-arg BUILD_NUMBER=$BUILD_NUMBER \ --build-arg BUILD_ARGS=$BUILD_ARGS \ - --build-arg DEPLOY_ARGS=$DEPLOY_ARGS + --build-arg DEPLOY_ARGS=$DEPLOY_ARGS \ + --build-arg REPO_RUN=$REPO_RUN \ + --build-arg REPO_RUN_TAG=$REPO_RUN_TAG