diff --git a/.github/workflows/4testing-build.yml b/.github/workflows/4testing-build.yml index 9aa8269..7465238 100644 --- a/.github/workflows/4testing-build.yml +++ b/.github/workflows/4testing-build.yml @@ -46,11 +46,11 @@ jobs: DOCKER_TAG=$(echo ${{ env.RELEASE_VERSION }} | sed 's/^.//' ) PACKAGE_VERSION=$( echo $DOCKER_TAG | sed -E 's/(.*)\./\1-/' ) if [[ ${{ env.RELEASE_VERSION }} == v99.99* ]]; then - sed -i "s|http://download.onlyoffice.com/install/documentserver/linux/\${COMPANY_NAME}-\${PRODUCT_NAME}\${PRODUCT_EDITION}|${{ secrets.UNSTABLE_REPO_URL }}${{ matrix.edition }}_$PACKAGE_VERSION|g" Dockerfile PACKAGE_URL=${{ secrets.UNSTABLE_REPO_URL }}${{ matrix.edition }}_"$PACKAGE_VERSION"_amd64.deb + URL_ARG=${{ secrets.UNSTABLE_REPO_URL }}${{ matrix.edition }}_"$PACKAGE_VERSION"_TARGETARCH.deb else - sed -i "s|http://download.onlyoffice.com/install/documentserver/linux/\${COMPANY_NAME}-\${PRODUCT_NAME}\${PRODUCT_EDITION}|${{ secrets.REPO_URL }}${{ matrix.edition }}_$PACKAGE_VERSION|g" Dockerfile PACKAGE_URL=${{ secrets.REPO_URL }}${{ matrix.edition }}_"$PACKAGE_VERSION"_amd64.deb + URL_ARG=${{ secrets.REPO_URL }}${{ matrix.edition }}_"$PACKAGE_VERSION"_TARGETARCH.deb fi STATUS=$(curl -s -o /dev/null -w "%{http_code}\n" "$PACKAGE_URL") if [[ "$STATUS" = "200" ]]; then @@ -96,7 +96,7 @@ jobs: PRODUCT_EDITION=${{ matrix.edition }} COMPANY_NAME=${{ env.COMPANY_NAME }} \ PRODUCT_NAME=${{ env.PRODUCT_NAME }} DOCKERFILE=Dockerfile \ PREFIX_NAME=4testing- TAG=$DOCKER_TAG PLATFORM=$PLATFORM \ - docker buildx bake \ + PACKAGE_URL=${URL_ARG} docker buildx bake \ -f docker-bake.hcl ${{ matrix.images }} \ --print @@ -105,7 +105,7 @@ jobs: PRODUCT_EDITION=${{ matrix.edition }} COMPANY_NAME=${{ env.COMPANY_NAME }} \ PRODUCT_NAME=${{ env.PRODUCT_NAME }} DOCKERFILE=Dockerfile \ PREFIX_NAME=4testing- TAG=$DOCKER_TAG PLATFORM=$PLATFORM \ - docker buildx bake \ + PACKAGE_URL=${URL_ARG} docker buildx bake \ -f docker-bake.hcl ${{ matrix.images }} \ --push echo "DONE: Build success >> exit with 0" diff --git a/Dockerfile b/Dockerfile index 7405b2b..e92adc3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -81,7 +81,9 @@ ENV COMPANY_NAME=$COMPANY_NAME \ PRODUCT_NAME=$PRODUCT_NAME \ PRODUCT_EDITION=$PRODUCT_EDITION -RUN wget -q -P /tmp "$PACKAGE_URL" && \ +RUN if [ $(uname -m) = "x86_64" ] ; then ARCH=amd64 ; else ARCH=arm64 ; fi && \ + PACKAGE_URL=$( echo $PACKAGE_URL | sed "s/TARGETARCH/"${ARCH}"/g") && \ + wget -q -P /tmp "$PACKAGE_URL" && \ apt-get -y update && \ service postgresql start && \ apt-get -yq install /tmp/$(basename "$PACKAGE_URL") && \ diff --git a/docker-bake.hcl b/docker-bake.hcl index a307a6a..6932d4b 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -34,6 +34,10 @@ variable "PLATFORM" { default = "" } +variable "PACKAGE_URL" { + default = "" +} + target "documentserver" { target = "documentserver" dockerfile= "${DOCKERFILE}" @@ -43,6 +47,7 @@ target "documentserver" { "PRODUCT_EDITION": "${PRODUCT_EDITION}" "PRODUCT_NAME": "${PRODUCT_NAME}" "COMPANY_NAME": "${COMPANY_NAME}" + "PACKAGE_URL": "{PACKAGE_URL}" "PLATFORM": "${PLATFORM}" } }