diff --git a/.github/workflows/ci-oci-install.yml b/.github/workflows/ci-oci-install.yml index 5775510f7f..32750d4e4c 100644 --- a/.github/workflows/ci-oci-install.yml +++ b/.github/workflows/ci-oci-install.yml @@ -68,7 +68,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python 3. uses: actions/setup-python@v5 @@ -81,9 +81,14 @@ jobs: sudo apt update -y sudo apt install vagrant virtualbox -y + - name: Free Disk Space + run: | + sudo rm -rf /usr/local/lib/android /opt/ghc + sudo docker image prune --all --force + - name: "Test production scripts with ${{matrix.name}}" if: ${{ github.event_name == 'schedule' }} - uses: nick-fields/retry@v2 + uses: nick-fields/retry@v3 with: max_attempts: 2 timeout_minutes: 40 @@ -107,7 +112,7 @@ jobs: - name: "Test Local scripts with ${{matrix.name}}" if: ${{ github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch' }} - uses: nick-fields/retry@v2 + uses: nick-fields/retry@v3 with: max_attempts: 2 timeout_minutes: 40 diff --git a/.github/workflows/ci-oci-update.yml b/.github/workflows/ci-oci-update.yml index 7535df9bb6..3e8eae28ee 100644 --- a/.github/workflows/ci-oci-update.yml +++ b/.github/workflows/ci-oci-update.yml @@ -66,7 +66,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python 3. uses: actions/setup-python@v5 @@ -86,7 +86,7 @@ jobs: - name: Testing with update ${{matrix.name}} if: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }} - uses: nick-fields/retry@v2 + uses: nick-fields/retry@v3 with: max_attempts: 1 timeout_minutes: 60 diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml index 8939385acc..e383af1a1c 100644 --- a/.github/workflows/main-build.yml +++ b/.github/workflows/main-build.yml @@ -55,13 +55,17 @@ jobs: run: | cd .${DOCKER_PATH} if [ "${{ matrix.branch }}" = "develop" ]; then - DOCKER_TAG="develop.${{ github.run_number }}" - else - DOCKER_TAG=$(echo "${{ matrix.branch }}" | sed '/^release\b\|^hotfix\b\|^feature\b/s/release.*\/\|hotfix.*\/\|feature.*\///; s/-git-action$//; s/^v//').${{github.run_number}} + PRODUCT_VERSION="develop" + DOCKER_TAG=${PRODUCT_VERSION}.${{ github.run_number }} + else + PRODUCT_VERSION=$(echo "${{ matrix.branch }}" | sed '/^release\b\|^hotfix\b\|^feature\b/s/release.*\/\|hotfix.*\/\|feature.*\///; s/-git-action$//; s/^v//') + DOCKER_TAG=${PRODUCT_VERSION}.${{github.run_number}} fi export DOCKER_TAG docker buildx bake -f build.yml \ --set *.args.GIT_BRANCH=${{ matrix.branch }} \ + --set *.args.PRODUCT_VERSION=${PRODUCT_VERSION} \ + --set *.args.BUILD_NUMBER=${BUILD_NUMBER} \ --set *.platform=linux/amd64 \ --push diff --git a/.github/workflows/rebuild-boxes.yml b/.github/workflows/rebuild-boxes.yml index c880988f43..5372f44a8f 100644 --- a/.github/workflows/rebuild-boxes.yml +++ b/.github/workflows/rebuild-boxes.yml @@ -64,7 +64,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Python 3. uses: actions/setup-python@v5 @@ -86,7 +86,7 @@ jobs: sudo docker image prune --all --force - name: Rebuild boxes - uses: nick-fields/retry@v2 + uses: nick-fields/retry@v3 with: max_attempts: 2 timeout_minutes: 90 diff --git a/config/appsettings.json b/config/appsettings.json index f5688824ac..d5ce60047c 100644 --- a/config/appsettings.json +++ b/config/appsettings.json @@ -371,7 +371,7 @@ "api": "api/2.0", "alias": { "min": 3, - "max": 100 + "max": 63 }, "api-system": "", "api-cache": "", diff --git a/install/OneClickInstall/install-RedHat/install-preq.sh b/install/OneClickInstall/install-RedHat/install-preq.sh index 03ff5373b7..6b333d600f 100644 --- a/install/OneClickInstall/install-RedHat/install-preq.sh +++ b/install/OneClickInstall/install-RedHat/install-preq.sh @@ -33,16 +33,20 @@ if rpm -qa | grep mariadb.*config >/dev/null 2>&1; then fi #Add repositories: EPEL, REMI and RPMFUSION -rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-$REV.noarch.rpm || true -rpm -ivh https://rpms.remirepo.net/enterprise/remi-release-$REV.rpm || true -yum localinstall -y --nogpgcheck https://download1.rpmfusion.org/free/el/rpmfusion-free-release-$REV.noarch.rpm +[ "$DIST" != "fedora" ] && { rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-$REV.noarch.rpm || true; } +rpm -ivh https://rpms.remirepo.net/$REMI_DISTR_NAME/remi-release-$REV.rpm || true +yum localinstall -y --nogpgcheck https://download1.rpmfusion.org/free/$RPMFUSION_DISTR_NAME/rpmfusion-free-release-$REV.noarch.rpm [ "$REV" = "9" ] && update-crypto-policies --set DEFAULT:SHA1 -[ "$DIST" != "redhat" ] && { [ "$REV" = "9" ] && TESTING_REPO="--enablerepo=crb" || POWERTOOLS_REPO="--enablerepo=powertools"; } || /usr/bin/crb enable +if [ "$DIST" == "centos" ]; then + [ "$REV" = "9" ] && TESTING_REPO="--enablerepo=crb" || POWERTOOLS_REPO="--enablerepo=powertools" +elif [ "$DIST" == "redhat" ]; then + /usr/bin/crb enable +fi #add rabbitmq & erlang repo -curl -s https://packagecloud.io/install/repositories/rabbitmq/rabbitmq-server/script.rpm.sh | os=centos dist=$REV bash -curl -s https://packagecloud.io/install/repositories/rabbitmq/erlang/script.rpm.sh | os=centos dist=$REV bash +curl -s https://packagecloud.io/install/repositories/rabbitmq/rabbitmq-server/script.rpm.sh | bash +curl -s https://packagecloud.io/install/repositories/rabbitmq/erlang/script.rpm.sh | bash #add nodejs repo NODE_VERSION="18" @@ -50,8 +54,8 @@ curl -fsSL https://rpm.nodesource.com/setup_${NODE_VERSION}.x | sed '/update -y/ #add mysql repo dnf remove -y @mysql && dnf module -y reset mysql && dnf module -y disable mysql -MYSQL_REPO_VERSION="$(curl https://repo.mysql.com | grep -oP "mysql80-community-release-el${REV}-\K.*" | grep -o '^[^.]*' | sort -n | tail -n1)" -yum localinstall -y https://repo.mysql.com/mysql80-community-release-el${REV}-${MYSQL_REPO_VERSION}.noarch.rpm || true +MYSQL_REPO_VERSION="$(curl https://repo.mysql.com | grep -oP "mysql80-community-release-${MYSQL_DISTR_NAME}${REV}-\K.*" | grep -o '^[^.]*' | sort | tail -n1)" +yum localinstall -y https://repo.mysql.com/mysql80-community-release-${MYSQL_DISTR_NAME}${REV}-${MYSQL_REPO_VERSION}.noarch.rpm || true if ! rpm -q mysql-community-server; then MYSQL_FIRST_TIME_INSTALL="true"; @@ -72,7 +76,8 @@ autorefresh=1 type=rpm-md END -# add nginx repo +# add nginx repo, Fedora doesn't need it +if [ "$DIST" != "fedora" ]; then cat > /etc/yum.repos.d/nginx.repo < /dev/null; then diff --git a/install/docker/config/nginx/onlyoffice-proxy-ssl.conf b/install/docker/config/nginx/onlyoffice-proxy-ssl.conf index 73eecf3edb..fc735e2346 100644 --- a/install/docker/config/nginx/onlyoffice-proxy-ssl.conf +++ b/install/docker/config/nginx/onlyoffice-proxy-ssl.conf @@ -4,8 +4,8 @@ proxy_set_header Host $the_host; proxy_set_header X-Forwarded-Host $the_host; proxy_set_header X-Forwarded-Proto $the_scheme; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; -more_clear_headers 'Server'; -more_clear_headers 'X-Powered-By'; +proxy_hide_header 'Server'; +proxy_hide_header 'X-Powered-By'; ## HTTP host server {