diff --git a/.github/workflows/stable-build.yml b/.github/workflows/stable-build.yml index f4ecfc5..9d7f6df 100644 --- a/.github/workflows/stable-build.yml +++ b/.github/workflows/stable-build.yml @@ -49,9 +49,9 @@ jobs: IMAGE_STATUS=$(docker manifest inspect ${{ env.COMPANY_NAME }}/4testing-${{ env.PRODUCT_NAME }}${{ matrix.edition }}:$TAG > /dev/null ; echo $?) if [[ "$IMAGE_STATUS" = "0" ]]; then echo "Image present on docker.hub >> start build stable version" - echo "FROM ${{ env.COMPANY_NAME }}/4testing-${{ env.PRODUCT_NAME }}${{ matrix.edition }}:$TAG as ${{ env.PRODUCT_NAME }}-stable" >> Dockerfile.stable - PRODUCT_EDITION=${{ matrix.edition }} PRODUCT_NAME=${{ env.PRODUCT_NAME }} \ - COMPANY_NAME=${{ env.COMPANY_NAME}} DOCKERFILE=Dockerfile.stable \ + PRODUCT_EDITION=${{ matrix.edition }} \ + PRODUCT_NAME=${{ env.PRODUCT_NAME }} \ + COMPANY_NAME=${{ env.COMPANY_NAME}} \ TAG=$TAG \ SHORTER_TAG=$SHORTER_TAG \ SHORTEST_TAG=$SHORTEST_TAG \ diff --git a/Dockerfile.nonexample b/Dockerfile.production similarity index 67% rename from Dockerfile.nonexample rename to Dockerfile.production index bd34bc2..3c7b3bd 100644 --- a/Dockerfile.nonexample +++ b/Dockerfile.production @@ -1,13 +1,19 @@ ### Arguments avavlivable only for FROM instruction ### -ARG PRODUCT_EDITION= ARG TAG=latest +ARG COMPANY_NAME=onlyoffice +ARG PRODUCT_EDITION= -FROM onlyoffice/documentserver${PRODUCT_EDITION}:${TAG} as documentserver-nonexample +### Build main-release ### + +FROM ${COMPANY_NAME}/4testing-documentserver${PRODUCT_EDITION}:${TAG} as documentserver-stable + +### Build nonexample ### + +FROM ${COMPANY_NAME}/documentserver${PRODUCT_EDITION}:${TAG} as documentserver-nonexample ARG COMPANY_NAME=onlyoffice ARG PRODUCT_NAME=documentserver ARG DS_SUPERVISOR_CONF=/etc/supervisor/conf.d/ds.conf -ARG WELCOME_CONF_DIR=/etc/nginx/includes/0ds-welcome.conf ### Remove all documentserver-example data ###