diff --git a/.github/workflows/stable-build.yml b/.github/workflows/stable-build.yml index d0cc970..7586bbc 100644 --- a/.github/workflows/stable-build.yml +++ b/.github/workflows/stable-build.yml @@ -8,6 +8,10 @@ on: description: 'Tag for release (ex. 1.2.3.45)' type: string required: true + pull_tag: + description: 'Tag pulled 4testin image (optional: if empty, will be used value from inputs.tag field)(ex. 1.2.3.45)' + type: string + required: false env: COMPANY_NAME: "onlyoffice" @@ -42,8 +46,13 @@ jobs: run: | set -eux VERSION=${{ github.event.inputs.tag }} + PULL_TAG=${{ github.event.inputs.pull_tag }} PRODUCT_EDITION=${{ matrix.edition }} TESTING_IMAGE=${COMPANY_NAME}/4testing-${PRODUCT_NAME}${PRODUCT_EDITION} + if [[ -z "${PULL_TAG}" ]]; then + PULL_TAG=${VERSION} + fi + export PULL_TAG=${PULL_TAG} export PRODUCT_EDITION export TAG=${VERSION} export SHORTER_TAG=${VERSION%.*} @@ -113,12 +122,18 @@ jobs: - name: build UCS run: | set -eux - export PRODUCT_EDITION=${{ matrix.edition }} - export PACKAGE_BASEURL=${{ secrets.REPO_BASEURL }}/test - export DOCKERFILE=Dockerfile - export BASE_IMAGE=ubuntu:20.04 - export PG_VERSION=12 - export TAG=${{ github.event.inputs.tag }} - export PACKAGE_VERSION=$( echo ${TAG} | sed -E 's/(.*)\./\1-/')~stretch - docker buildx bake -f docker-bake.hcl documentserver-ucs --push + VERSION=${{ github.event.inputs.tag }} + PULL_TAG=${{ github.event.inputs.pull_tag }} + BUILD_TAG=${VERSION} + if [[ "${PULL_TAG}" != "" ]]; then + BUILD_TAG=${PULL_TAG} + fi + export PRODUCT_EDITION=${{ matrix.edition }} + export PACKAGE_BASEURL=${{ secrets.REPO_BASEURL }}/test + export DOCKERFILE=Dockerfile + export BASE_IMAGE=ubuntu:20.04 + export PG_VERSION=12 + export TAG=${VERSION} + export PACKAGE_VERSION=$( echo ${BUILD_TAG} | sed -E 's/(.*)\./\1-/')~stretch + docker buildx bake -f docker-bake.hcl documentserver-ucs --push shell: bash diff --git a/docker-bake.hcl b/docker-bake.hcl index 28396a6..ffb7fd4 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -2,6 +2,10 @@ variable "TAG" { default = "" } +variable "PULL_TAG" { + default = "" +} + variable "SHORTER_TAG" { default = "" } @@ -91,6 +95,7 @@ target "documentserver-stable" { platforms = ["linux/amd64", "linux/arm64"] args = { "TAG": "${TAG}" + "PULL_TAG": "${PULL_TAG}" "COMPANY_NAME": "${COMPANY_NAME}" "PRODUCT_NAME": "${PRODUCT_NAME}" "PRODUCT_EDITION": "${PRODUCT_EDITION}" diff --git a/production.dockerfile b/production.dockerfile index 3c7b3bd..0706a58 100644 --- a/production.dockerfile +++ b/production.dockerfile @@ -1,15 +1,15 @@ ### Arguments avavlivable only for FROM instruction ### -ARG TAG=latest +ARG PULL_TAG=latest ARG COMPANY_NAME=onlyoffice ARG PRODUCT_EDITION= ### Build main-release ### -FROM ${COMPANY_NAME}/4testing-documentserver${PRODUCT_EDITION}:${TAG} as documentserver-stable +FROM ${COMPANY_NAME}/4testing-documentserver${PRODUCT_EDITION}:${PULL_TAG} as documentserver-stable ### Build nonexample ### -FROM ${COMPANY_NAME}/documentserver${PRODUCT_EDITION}:${TAG} as documentserver-nonexample +FROM ${COMPANY_NAME}/documentserver${PRODUCT_EDITION}:${PULL_TAG} as documentserver-nonexample ARG COMPANY_NAME=onlyoffice ARG PRODUCT_NAME=documentserver